Commit 39171c86 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'dm-4.2-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull device mapper fixes from Mike Snitzer:

 - stable fix for a dm_merge_bvec() regression on 32 bit Fedora systems.

 - fix for a 4.2 DM thinp discard regression due to inability to
   properly delete a range of blocks in a data mapping btree.

* tag 'dm-4.2-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm btree remove: fix bug in remove_one()
  dm: fix dm_merge_bvec regression on 32 bit systems
parents f0943013 aa0cd28d
...@@ -1729,7 +1729,8 @@ static int dm_merge_bvec(struct request_queue *q, ...@@ -1729,7 +1729,8 @@ static int dm_merge_bvec(struct request_queue *q,
struct mapped_device *md = q->queuedata; struct mapped_device *md = q->queuedata;
struct dm_table *map = dm_get_live_table_fast(md); struct dm_table *map = dm_get_live_table_fast(md);
struct dm_target *ti; struct dm_target *ti;
sector_t max_sectors, max_size = 0; sector_t max_sectors;
int max_size = 0;
if (unlikely(!map)) if (unlikely(!map))
goto out; goto out;
...@@ -1742,18 +1743,10 @@ static int dm_merge_bvec(struct request_queue *q, ...@@ -1742,18 +1743,10 @@ static int dm_merge_bvec(struct request_queue *q,
* Find maximum amount of I/O that won't need splitting * Find maximum amount of I/O that won't need splitting
*/ */
max_sectors = min(max_io_len(bvm->bi_sector, ti), max_sectors = min(max_io_len(bvm->bi_sector, ti),
(sector_t) queue_max_sectors(q)); (sector_t) BIO_MAX_SECTORS);
max_size = (max_sectors << SECTOR_SHIFT) - bvm->bi_size; max_size = (max_sectors << SECTOR_SHIFT) - bvm->bi_size;
if (max_size < 0)
/* max_size = 0;
* FIXME: this stop-gap fix _must_ be cleaned up (by passing a sector_t
* to the targets' merge function since it holds sectors not bytes).
* Just doing this as an interim fix for stable@ because the more
* comprehensive cleanup of switching to sector_t will impact every
* DM target that implements a ->merge hook.
*/
if (max_size > INT_MAX)
max_size = INT_MAX;
/* /*
* merge_bvec_fn() returns number of bytes * merge_bvec_fn() returns number of bytes
...@@ -1761,13 +1754,13 @@ static int dm_merge_bvec(struct request_queue *q, ...@@ -1761,13 +1754,13 @@ static int dm_merge_bvec(struct request_queue *q,
* max is precomputed maximal io size * max is precomputed maximal io size
*/ */
if (max_size && ti->type->merge) if (max_size && ti->type->merge)
max_size = ti->type->merge(ti, bvm, biovec, (int) max_size); max_size = ti->type->merge(ti, bvm, biovec, max_size);
/* /*
* If the target doesn't support merge method and some of the devices * If the target doesn't support merge method and some of the devices
* provided their merge_bvec method (we know this by looking for the * provided their merge_bvec method (we know this by looking at
* max_hw_sectors that dm_set_device_limits may set), then we can't * queue_max_hw_sectors), then we can't allow bios with multiple vector
* allow bios with multiple vector entries. So always set max_size * entries. So always set max_size to 0, and the code below allows
* to 0, and the code below allows just one page. * just one page.
*/ */
else if (queue_max_hw_sectors(q) <= PAGE_SIZE >> 9) else if (queue_max_hw_sectors(q) <= PAGE_SIZE >> 9)
max_size = 0; max_size = 0;
......
...@@ -689,6 +689,7 @@ static int remove_one(struct dm_btree_info *info, dm_block_t root, ...@@ -689,6 +689,7 @@ static int remove_one(struct dm_btree_info *info, dm_block_t root,
value_ptr(n, index)); value_ptr(n, index));
delete_at(n, index); delete_at(n, index);
keys[last_level] = k + 1ull;
} else } else
r = -ENODATA; r = -ENODATA;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment