mirror of
https://github.com/torvalds/linux.git
synced 2024-09-21 07:23:06 +00:00
mm/truncate: avoid pointless cleancache_invalidate_inode() calls.
cleancache_invalidate_inode() called truncate_inode_pages_range() and invalidate_inode_pages2_range() twice - on entry and on exit. It's stupid and waste of time. It's enough to call it once at exit. Link: http://lkml.kernel.org/r/20170424164135.22350-5-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>
This commit is contained in:
parent
32691f0fbe
commit
34ccb69ea2
|
@ -266,9 +266,8 @@ void truncate_inode_pages_range(struct address_space *mapping,
|
||||||
pgoff_t index;
|
pgoff_t index;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
cleancache_invalidate_inode(mapping);
|
|
||||||
if (mapping->nrpages == 0 && mapping->nrexceptional == 0)
|
if (mapping->nrpages == 0 && mapping->nrexceptional == 0)
|
||||||
return;
|
goto out;
|
||||||
|
|
||||||
/* Offsets within partial pages */
|
/* Offsets within partial pages */
|
||||||
partial_start = lstart & (PAGE_SIZE - 1);
|
partial_start = lstart & (PAGE_SIZE - 1);
|
||||||
|
@ -363,7 +362,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
|
||||||
* will be released, just zeroed, so we can bail out now.
|
* will be released, just zeroed, so we can bail out now.
|
||||||
*/
|
*/
|
||||||
if (start >= end)
|
if (start >= end)
|
||||||
return;
|
goto out;
|
||||||
|
|
||||||
index = start;
|
index = start;
|
||||||
for ( ; ; ) {
|
for ( ; ; ) {
|
||||||
|
@ -410,6 +409,8 @@ void truncate_inode_pages_range(struct address_space *mapping,
|
||||||
pagevec_release(&pvec);
|
pagevec_release(&pvec);
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
out:
|
||||||
cleancache_invalidate_inode(mapping);
|
cleancache_invalidate_inode(mapping);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(truncate_inode_pages_range);
|
EXPORT_SYMBOL(truncate_inode_pages_range);
|
||||||
|
@ -623,9 +624,8 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
|
||||||
int ret2 = 0;
|
int ret2 = 0;
|
||||||
int did_range_unmap = 0;
|
int did_range_unmap = 0;
|
||||||
|
|
||||||
cleancache_invalidate_inode(mapping);
|
|
||||||
if (mapping->nrpages == 0 && mapping->nrexceptional == 0)
|
if (mapping->nrpages == 0 && mapping->nrexceptional == 0)
|
||||||
return 0;
|
goto out;
|
||||||
|
|
||||||
pagevec_init(&pvec, 0);
|
pagevec_init(&pvec, 0);
|
||||||
index = start;
|
index = start;
|
||||||
|
@ -689,6 +689,8 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
|
||||||
cond_resched();
|
cond_resched();
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
out:
|
||||||
cleancache_invalidate_inode(mapping);
|
cleancache_invalidate_inode(mapping);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user