diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-22 17:00:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-22 17:00:04 -0800 |
| commit | 9efa3ed504edb1c1fc88dba96fd32168f50ab77c (patch) | |
| tree | b41b035a77e0a738a2769a72aaaf1818961b64bd /fs/drop_caches.c | |
| parent | c60174717544aa8959683d7e19d568309c3a0c65 (diff) | |
| parent | 1edc8eb2e93130e36ac74ac9c80913815a57d413 (diff) | |
| download | linux-9efa3ed504edb1c1fc88dba96fd32168f50ab77c.tar.gz linux-9efa3ed504edb1c1fc88dba96fd32168f50ab77c.tar.bz2 linux-9efa3ed504edb1c1fc88dba96fd32168f50ab77c.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"Eric's s_inodes softlockup fixes + Jan's fix for recent regression
from pipe rework"
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fs: call fsnotify_sb_delete after evict_inodes
fs: avoid softlockups in s_inodes iterators
pipe: Fix bogus dereference in iov_iter_alignment()
Diffstat (limited to 'fs/drop_caches.c')
| -rw-r--r-- | fs/drop_caches.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/drop_caches.c b/fs/drop_caches.c index d31b6c72b476..dc1a1d5d825b 100644 --- a/fs/drop_caches.c +++ b/fs/drop_caches.c @@ -35,11 +35,11 @@ static void drop_pagecache_sb(struct super_block *sb, void *unused) spin_unlock(&inode->i_lock); spin_unlock(&sb->s_inode_list_lock); - cond_resched(); invalidate_mapping_pages(inode->i_mapping, 0, -1); iput(toput_inode); toput_inode = inode; + cond_resched(); spin_lock(&sb->s_inode_list_lock); } spin_unlock(&sb->s_inode_list_lock); |