summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSuleiman Souhlal <suleiman@google.com>2013-04-13 16:03:06 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-16 21:27:26 -0700
commit7077c66b3ab3a1d336648cf88f54df43709ebac3 (patch)
tree2afe6bfbe8770c1acd0bc4b715a46e0309b045ed
parenteced4ec1b69c8cc5428ef29b947376bc6d57c8ce (diff)
downloadlinux-3.10-7077c66b3ab3a1d336648cf88f54df43709ebac3.tar.gz
linux-3.10-7077c66b3ab3a1d336648cf88f54df43709ebac3.tar.bz2
linux-3.10-7077c66b3ab3a1d336648cf88f54df43709ebac3.zip
vfs: Revert spurious fix to spinning prevention in prune_icache_sb
commit 5b55d708335a9e3e4f61f2dadf7511502205ccd1 upstream. Revert commit 62a3ddef6181 ("vfs: fix spinning prevention in prune_icache_sb"). This commit doesn't look right: since we are looking at the tail of the list (sb->s_inode_lru.prev) if we want to skip an inode, we should put it back at the head of the list instead of the tail, otherwise we will keep spinning on it. Discovered when investigating why prune_icache_sb came top in perf reports of a swapping load. Signed-off-by: Suleiman Souhlal <suleiman@google.com> Signed-off-by: Hugh Dickins <hughd@google.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/inode.c b/fs/inode.c
index 9f4f5fecc09..8de457e8ed0 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -705,7 +705,7 @@ void prune_icache_sb(struct super_block *sb, int nr_to_scan)
* inode to the back of the list so we don't spin on it.
*/
if (!spin_trylock(&inode->i_lock)) {
- list_move_tail(&inode->i_lru, &sb->s_inode_lru);
+ list_move(&inode->i_lru, &sb->s_inode_lru);
continue;
}