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
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user