Skip to contentSkip to conversation

writeback data corruption fix

GIT PULL Fengguang Wu 1 participant 1 message Jan 13, 2014 VFS

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull a writeback fix, it has been in linux-next for one month.

The following changes since commit 374b105797c3d4f29c685f3be535c35f5689b30e:

Linux 3.13-rc3 (2013-12-06 09:34:04 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git tags/writeback-fixes

for you to fetch changes up to f9b0e058cbd04ada76b13afffa7e1df830543c24:

writeback: Fix data corruption on NFS (2013-12-14 04:21:26 +0800)

----------------------------------------------------------------
fix data corruption on NFS writeback

----------------------------------------------------------------
Jan Kara (1):
writeback: Fix data corruption on NFS

 fs/fs-writeback.c |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
fs/fs-writeback.c +9 -6
index 1f4a10e..e0259a1 100644
@@ -516,13 +516,16 @@ writeback_single_inode(struct inode *inode, struct bdi_writeback *wb,
 	}
 	WARN_ON(inode->i_state & I_SYNC);
 	/*
-	 * Skip inode if it is clean. We don't want to mess with writeback
-	 * lists in this function since flusher thread may be doing for example
-	 * sync in parallel and if we move the inode, it could get skipped. So
-	 * here we make sure inode is on some writeback list and leave it there
-	 * unless we have completely cleaned the inode.
+	 * Skip inode if it is clean and we have no outstanding writeback in
+	 * WB_SYNC_ALL mode. We don't want to mess with writeback lists in this
+	 * function since flusher thread may be doing for example sync in
+	 * parallel and if we move the inode, it could get skipped. So here we
+	 * make sure inode is on some writeback list and leave it there unless
+	 * we have completely cleaned the inode.
 	 */
-	if (!(inode->i_state & I_DIRTY))
+	if (!(inode->i_state & I_DIRTY) &&
+	    (wbc->sync_mode != WB_SYNC_ALL ||
+	     !mapping_tagged(inode->i_mapping, PAGECACHE_TAG_WRITEBACK)))
 		goto out;
 	inode->i_state |= I_SYNC;
 	spin_unlock(&inode->i_lock);