diff options
Diffstat (limited to 'debian/patches/bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch')
| -rw-r--r-- | debian/patches/bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/debian/patches/bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch b/debian/patches/bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch index ac3f6aa9dfb7..aa8c0eacc895 100644 --- a/debian/patches/bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch +++ b/debian/patches/bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch @@ -1,4 +1,3 @@ -From b31595992e52f94bd87c122dfad9cc37f15f82dc Mon Sep 17 00:00:00 2001 From: Ben Hutchings <ben@decadent.org.uk> Date: Sun, 28 Nov 2010 23:46:46 +0000 Subject: [PATCH] dm: Deal with merge_bvec_fn in component devices better @@ -22,14 +21,9 @@ known to submit multiple small buffers in a single bio. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- - drivers/md/dm-table.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c -index 90267f8..776734d 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c -@@ -511,15 +511,15 @@ int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev, +@@ -511,14 +511,15 @@ int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev, (unsigned long long) start << SECTOR_SHIFT); /* @@ -46,12 +40,8 @@ index 90267f8..776734d 100644 + } - if (q->merge_bvec_fn && !ti->type->merge) -- limits->max_sectors = -- min_not_zero(limits->max_sectors, -- (unsigned int) (PAGE_SIZE >> 9)); +- blk_limits_max_hw_sectors(limits, +- (unsigned int) (PAGE_SIZE >> 9)); return 0; } EXPORT_SYMBOL_GPL(dm_set_device_limits); --- -1.7.2.3 - |