From: J. R. Okajima <[email protected]> ------------------- This is a commit scheduled for the next v2.6.34 longterm release. If you see a problem with using this for longterm, please comment. -------------------
commit 0702099bd86c33c2dcdbd3963433a61f3f503901 upstream. By the commit af7fa16 2010-08-03 NFS: Fix up the fsync code close(2) became returning the non-zero value even if it went well. nfs_file_fsync() should return 0 when "status" is positive. [PG: in 34, nfs_file_fsync is just a wrapper around nfs_do_fsync, so the related code and actual change lands in nfs_do_fsync here.] Signed-off-by: J. R. Okajima <[email protected]> Signed-off-by: Trond Myklebust <[email protected]> Signed-off-by: Paul Gortmaker <[email protected]> --- fs/nfs/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 7f7df1d..1c91289 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -219,7 +219,7 @@ static int nfs_do_fsync(struct nfs_open_context *ctx, struct inode *inode) have_error |= test_bit(NFS_CONTEXT_ERROR_WRITE, &ctx->flags); if (have_error) ret = xchg(&ctx->error, 0); - if (!ret) + if (!ret && status < 0) ret = status; return ret; } -- 1.7.4.4 _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
