diff options
author | J. R. Okajima <hooanon05@yahoo.co.jp> | 2010-08-11 13:10:16 -0400 |
---|---|---|
committer | Willy Tarreau <w@1wt.eu> | 2011-04-30 16:53:04 +0200 |
commit | fb35bcad2fe725cace7d25e03952ecd1a46da557 (patch) | |
tree | 6b49bd2911302f6ca68e34da0c130d780199bbf2 /fs | |
parent | 8fd8fd4798d5800dbf2a924a48f019fb777238d3 (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>
Diffstat (limited to 'fs')
-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 e5a08740d4f..7e11f13049f 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -218,7 +218,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; } |