aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSuleiman Souhlal2013-04-13 18:03:06 -0500
committerGreg Kroah-Hartman2013-04-16 23:48:28 -0500
commit7e59255a79c958e7f114f098896924ea86fc4967 (patch)
tree68d146ca9f2d378bd0cff2803facf005ea247446 /fs
parent51fd56450d83624ca98c5e9e9340c3c6165ead6f (diff)
downloadkernel-omap-7e59255a79c958e7f114f098896924ea86fc4967.tar.gz
kernel-omap-7e59255a79c958e7f114f098896924ea86fc4967.tar.xz
kernel-omap-7e59255a79c958e7f114f098896924ea86fc4967.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>
Diffstat (limited to 'fs')
-rw-r--r--fs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/inode.c b/fs/inode.c
index 14084b72b259..b98540ef35da 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -725,7 +725,7 @@ void prune_icache_sb(struct super_block *sb, int nr_to_scan)
725 * inode to the back of the list so we don't spin on it. 725 * inode to the back of the list so we don't spin on it.
726 */ 726 */
727 if (!spin_trylock(&inode->i_lock)) { 727 if (!spin_trylock(&inode->i_lock)) {
728 list_move_tail(&inode->i_lru, &sb->s_inode_lru); 728 list_move(&inode->i_lru, &sb->s_inode_lru);
729 continue; 729 continue;
730 } 730 }
731 731