From d821992d59ce737d3237853f06972dc97e48e6e7 Mon Sep 17 00:00:00 2001 From: Fred Isaman Date: Wed, 23 Mar 2011 13:27:44 +0000 Subject: [PATCH] --- yaml --- r: 242410 b: refs/heads/master c: 465d52437d5ce8d4eb9da0d3e3818b51cff163a1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/write.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bff74c67d70c..be24c97f2210 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ef2ce3e16d9bec6cf015207c1c82a5b864046ac +refs/heads/master: 465d52437d5ce8d4eb9da0d3e3818b51cff163a1 diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c index 55a8c3671233..92b4a6614fd3 100644 --- a/trunk/fs/nfs/write.c +++ b/trunk/fs/nfs/write.c @@ -474,7 +474,10 @@ nfs_clear_request_commit(struct nfs_page *req) static inline int nfs_write_need_commit(struct nfs_write_data *data) { - return data->verf.committed != NFS_FILE_SYNC; + if (data->verf.committed == NFS_DATA_SYNC) + return data->lseg == NULL; + else + return data->verf.committed != NFS_FILE_SYNC; } static inline