mbox

Hardy SRU, NFS: fix the return value of nfs_file_fsync()

Message ID 20110214203623.48B35F89F7@sepang.rtg.net
State Accepted
Headers show

Pull-request

git://kernel.ubuntu.com/rtg/ubuntu-hardy.git nfs-file-fsync-lp585657

Message

Tim Gardner Feb. 14, 2011, 8:36 p.m. UTC 
The following changes since commit 5bf9236073ce2e72d236a55898c41e35b817d298:
  Alan Cox (1):
        bluetooth: Fix missing NULL check, CVE-2010-4242

are available in the git repository at:

  git://kernel.ubuntu.com/rtg/ubuntu-hardy.git nfs-file-fsync-lp585657

Tim Gardner (1):
      NFS: fix the return value of nfs_file_fsync()

 fs/nfs/file.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

From eeddeda3f7aedb87cddae362935060b632a731fc Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Fri, 11 Feb 2011 11:04:37 -0700
Subject: [PATCH] NFS: fix the return value of nfs_file_fsync()

BugLink: http://bugs.launchpad.net/bugs/585657

Backport of 0702099bd86c33c2dcdbd3963433a61f3f503901

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>
---
 fs/nfs/file.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

John Johansen Feb. 14, 2011, 9:05 p.m. UTC | #1 
On 02/14/2011 12:36 PM, Tim Gardner wrote:
> The following changes since commit 5bf9236073ce2e72d236a55898c41e35b817d298:
>   Alan Cox (1):
>         bluetooth: Fix missing NULL check, CVE-2010-4242
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/rtg/ubuntu-hardy.git nfs-file-fsync-lp585657
> 
> Tim Gardner (1):
>       NFS: fix the return value of nfs_file_fsync()
> 
>  fs/nfs/file.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> From eeddeda3f7aedb87cddae362935060b632a731fc Mon Sep 17 00:00:00 2001
> From: Tim Gardner <tim.gardner@canonical.com>
> Date: Fri, 11 Feb 2011 11:04:37 -0700
> Subject: [PATCH] NFS: fix the return value of nfs_file_fsync()
> 
> BugLink: http://bugs.launchpad.net/bugs/585657
> 
> Backport of 0702099bd86c33c2dcdbd3963433a61f3f503901
> 
> 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>

all the paths look the same as in 2.6.32 so

Acked-by: John Johansen <john.johnansen@canonical.com>

> ---
>  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 ea82f1d..5a072ad 100644
> --- a/fs/nfs/file.c
> +++ b/fs/nfs/file.c
> @@ -196,7 +196,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;
>  }
Stefan Bader Feb. 15, 2011, 8:07 a.m. UTC | #2 
On 02/14/2011 09:36 PM, Tim Gardner wrote:
> The following changes since commit 5bf9236073ce2e72d236a55898c41e35b817d298:
>   Alan Cox (1):
>         bluetooth: Fix missing NULL check, CVE-2010-4242
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/rtg/ubuntu-hardy.git nfs-file-fsync-lp585657
> 
> Tim Gardner (1):
>       NFS: fix the return value of nfs_file_fsync()
> 
>  fs/nfs/file.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> From eeddeda3f7aedb87cddae362935060b632a731fc Mon Sep 17 00:00:00 2001
> From: Tim Gardner <tim.gardner@canonical.com>
> Date: Fri, 11 Feb 2011 11:04:37 -0700
> Subject: [PATCH] NFS: fix the return value of nfs_file_fsync()
> 
> BugLink: http://bugs.launchpad.net/bugs/585657
> 
> Backport of 0702099bd86c33c2dcdbd3963433a61f3f503901
> 
> 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>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  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 ea82f1d..5a072ad 100644
> --- a/fs/nfs/file.c
> +++ b/fs/nfs/file.c
> @@ -196,7 +196,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;
>  }
Stefan Bader Feb. 15, 2011, 9:03 a.m. UTC | #3 
Applied and pushed to master-next