2007-12-28 13:52:18

by Wu Fengguang

[permalink] [raw]
Subject: [PATCH 04/11] writeback: requeue_io_wait() on locked inode

Convert to requeue_io_wait() for case:

inode is locked

Cc: Michael Rubin <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Signed-off-by: Fengguang Wu <[email protected]>
---
fs/fs-writeback.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

--- linux-2.6.24-rc6-mm1.orig/fs/fs-writeback.c
+++ linux-2.6.24-rc6-mm1/fs/fs-writeback.c
@@ -322,16 +322,13 @@ __writeback_single_inode(struct inode *i
WARN_ON(inode->i_state & I_WILL_FREE);

if ((wbc->sync_mode != WB_SYNC_ALL) && (inode->i_state & I_SYNC)) {
/*
* We're skipping this inode because it's locked, and we're not
- * doing writeback-for-data-integrity. Move it to s_more_io so
- * that writeback can proceed with the other inodes on s_io.
- * We'll have another go at writing back this inode when we
- * completed a full scan of s_io.
+ * doing writeback-for-data-integrity. Recheck it after a while.
*/
- requeue_io(inode);
+ requeue_io_wait(inode);
return 0;
}

/*
* It's a data-integrity sync. We must wait.

--