Skip to content

Commit 7aad381

Browse files
aryabiningregkh
authored andcommitted
fs/block_dev: always invalidate cleancache in invalidate_bdev()
commit a5f6a6a9c72eac38a7fadd1a038532bc8516337c upstream. 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: c515e1f ("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> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent bb7031c commit 7aad381

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

fs/block_dev.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,11 @@ void invalidate_bdev(struct block_device *bdev)
8888
{
8989
struct address_space *mapping = bdev->bd_inode->i_mapping;
9090

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

0 commit comments

Comments
 (0)