2013-04-13 23:03:11

by Hugh Dickins

[permalink] [raw]
Subject: [PATCH] vfs: Revert spurious fix to spinning prevention in prune_icache_sb

From: Suleiman Souhlal <[email protected]>

Revert v3.2's 62a3dde ("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 <[email protected]>
Signed-off-by: Hugh Dickins <[email protected]>
Cc: [email protected]
---

fs/inode.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/fs/inode.c
+++ b/fs/inode.c
@@ -725,7 +725,7 @@ void prune_icache_sb(struct super_block *sb, int nr_to_scan, int priority)
* 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;
}