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

[Tim Gardner]

The following changes since commit 92520197d26effb0e8ffb94c40ebabfe4c7bcab5:
  Bruce Rogers (1):
        virtio_net: Add schedule check to napi_enable call

are available in the git repository at:

  git://kernel.ubuntu.com/rtg/ubuntu-maverick.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 5c91fe497d7f593356315909b08126bc8c9357e0 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner at canonical.com>
Date: Fri, 11 Feb 2011 14:26:05 -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 at yahoo.co.jp>
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
Signed-off-by: Tim Gardner <tim.gardner at 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 642c819..6fd4fba 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -222,7 +222,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.0.4