diff options
| author | J. R. Okajima <hooanon05@yahoo.co.jp> | 2010-08-11 13:10:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-02 09:46:40 -0500 |
| commit | 4dd117b9e4bda38bff030f24b43f8f769ec1551e (patch) | |
| tree | 95679cb46df702671747a3e522d91a273be49f06 | |
| parent | 2d7b204f69587095283baf90779aeecc59ff6fff (diff) | |
NFS: fix the return value of nfs_file_fsync()
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.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | 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 6fed6ccbf68..99545e263b0 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -220,7 +220,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; } |