aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2010-02-19 20:03:18 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-03-05 15:44:54 -0500
commit2928db1ffeacc9717c2d5c230d450bcc377b3ae9 (patch)
treec0dea3d26d45c3ea1a3602984ed4738b93373f67
parent5bad5abec4058c5214bfc72cec418348d6747977 (diff)
NFS: Ensure inode is always marked I_DIRTY_DATASYNC, if it has unstable pages
Since nfs_scan_list() doesn't wait for locked pages, we have a race in which it is possible to end up with an inode that needs to send a COMMIT, but which does not have the I_DIRTY_DATASYNC flag set. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/write.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 704e67d392e5..e40e949598fd 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -582,6 +582,8 @@ nfs_scan_commit(struct inode *inode, struct list_head *dst, pgoff_t idx_start, u
582 ret = nfs_scan_list(nfsi, dst, idx_start, npages, NFS_PAGE_TAG_COMMIT); 582 ret = nfs_scan_list(nfsi, dst, idx_start, npages, NFS_PAGE_TAG_COMMIT);
583 if (ret > 0) 583 if (ret > 0)
584 nfsi->ncommit -= ret; 584 nfsi->ncommit -= ret;
585 if (nfs_need_commit(NFS_I(inode)))
586 __mark_inode_dirty(inode, I_DIRTY_DATASYNC);
585 return ret; 587 return ret;
586} 588}
587#else 589#else