Commit a5f6a6a9 authored May 03, 2017 by Andrey Ryabinin Committed by Linus Torvalds May 03, 2017

fs/block_dev: always invalidate cleancache in invalidate_bdev()

invalidate_bdev() calls cleancache_invalidate_inode() iff ->nrpages != 0
which doen't make any sense.

Make sure that invalidate_bdev() always calls cleancache_invalidate_inode()
regardless of mapping->nrpages value.

Fixes: c515e1fd ("mm/fs: add hooks to support cleancache")
Link: http://lkml.kernel.org/r/20170424164135.22350-3-aryabinin@virtuozzo.com


Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Alexey Kuznetsov <kuznet@virtuozzo.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Nikolay Borisov <n.borisov.lkml@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 55635ba7

fs/block_dev.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -103,12 +103,11 @@ void invalidate_bdev(struct block_device *bdev)
		{
		struct address_space *mapping = bdev->bd_inode->i_mapping;

		if (mapping->nrpages == 0)
		return;

		if (mapping->nrpages) {
		invalidate_bh_lrus();
		lru_add_drain_all(); /* make sure all lru add caches are flushed */
		invalidate_mapping_pages(mapping, 0, -1);
		}
		/* 99% of the time, we don't need to flush the cleancache on the bdev.
		* But, for the strange corners, lets be cautious
		*/

Admin message