diff options
| author | Jens Axboe | 2013-12-31 17:51:02 +0100 |
|---|---|---|
| committer | Jens Axboe | 2013-12-31 17:51:02 +0100 |
| commit | b28bc9b38c52f63f43e3fd875af982f2240a2859 (patch) | |
| tree | 76cdb7b52b58f5685993cc15ed81d1c903023358 /drivers/md/dm-cache-target.c | |
| parent | dm cache: increment bi_remaining when bi_end_io is restored (diff) | |
| parent | Linux 3.13-rc6 (diff) | |
| download | kernel-qcow2-linux-b28bc9b38c52f63f43e3fd875af982f2240a2859.tar.gz kernel-qcow2-linux-b28bc9b38c52f63f43e3fd875af982f2240a2859.tar.xz kernel-qcow2-linux-b28bc9b38c52f63f43e3fd875af982f2240a2859.zip | |
Merge tag 'v3.13-rc6' into for-3.14/core
Needed to bring blk-mq uptodate, since changes have been going in
since for-3.14/core was established.
Fixup merge issues related to the immutable biovec changes.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Conflicts:
block/blk-flush.c
fs/btrfs/check-integrity.c
fs/btrfs/extent_io.c
fs/btrfs/scrub.c
fs/logfs/dev_bdev.c
Diffstat (limited to 'drivers/md/dm-cache-target.c')
| -rw-r--r-- | drivers/md/dm-cache-target.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c index 7c8dd1f69ce0..99f91628a33a 100644 --- a/drivers/md/dm-cache-target.c +++ b/drivers/md/dm-cache-target.c @@ -2763,7 +2763,7 @@ static int resize_cache_dev(struct cache *cache, dm_cblock_t new_size) { int r; - r = dm_cache_resize(cache->cmd, cache->cache_size); + r = dm_cache_resize(cache->cmd, new_size); if (r) { DMERR("could not resize cache metadata"); return r; |