summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJ. R. Okajima <hooanon05@yahoo.co.jp>2010-08-11 19:10:16 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-08-11 19:10:16 +0200
commit0702099bd86c33c2dcdbd3963433a61f3f503901 (patch)
treeebbee6ecfe26f139f44aa3b973f4728ebc9d11a9 /fs
parentrpcrdma: Fix SQ size calculation when memreg is FRMR (diff)
downloadlinux-0702099bd86c33c2dcdbd3963433a61f3f503901.tar.xz
linux-0702099bd86c33c2dcdbd3963433a61f3f503901.zip
NFS: fix the return value of nfs_file_fsync()
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. Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 2d141a74ae82..eb51bd6201da 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -323,7 +323,7 @@ nfs_file_fsync(struct file *file, int datasync)
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;
}