NFS: drop the fsync patch, not required by itself.

As seen on stable ML:

   On Fri, 2011-06-24 at 11:03 +0900, J. R. Okajima wrote:
   > > Paul Gortmaker:
   >> > > 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.
   >> > >
   >> > > [PG: in 34, nfs_file_fsync is just a wrapper around nfs_do_fsync,
   >> > >  so the related code and actual change lands in nfs_do_fsync here.]
   > >
   > > In these 247 patches, I could not find the backport of
   > > 	af7fa16 2010-08-03 NFS: Fix up the fsync code
   > > If you bring the commit af7fa16 into 2.6.34.10, then you will need this
   > > one (0702099bd in upstream) too. Otherwise I am afraid it is
   > > unnecessary.
   > > But I'd ask a reply from Trond Myklebust.
   I agree.

   Cheers
     Trond

   -- Trond Myklebust Linux NFS client maintainer

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

3 files changed, 1 insertions, 36 deletions

diff --git a/audit/from-v2.6.32/audit.txt b/audit/from-v2.6.32/audit.txt
index c521d92..e4899f6 100644
--- a/audit/from-v2.6.32/audit.txt
+++ b/audit/from-v2.6.32/audit.txt
@@ -2564,7 +2564,7 @@ fe20aa6e 	a5990ea1	v2.6.35		n
 8c948adc 	3c945e5b	v2.6.34		y
 01eda7c1 	38ad1c8e	v2.6.33		y
 9ea93dcc 	40f08a72	v2.6.37		n
-4dd117b9 	0702099b	v2.6.36		n
+4dd117b9 	0702099b	v2.6.36		n	not req'd see SML 06/24
 2d7b204f 	cc56f7de	v2.6.33		y
 89065079 	fb2b2a1d	v2.6.38		n
 016d370b 	2edeaa34	v2.6.38		n
diff --git a/queue/NFS-fix-the-return-value-of-nfs_file_fsync.patch b/queue/NFS-fix-the-return-value-of-nfs_file_fsync.patch
deleted file mode 100644
index feb743c..0000000
--- a/queue/NFS-fix-the-return-value-of-nfs_file_fsync.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 70b1b12e94d37a432016e8f71fc0b25845bc988d Mon Sep 17 00:00:00 2001
-From: J. R. Okajima <hooanon05@yahoo.co.jp>
-Date: Wed, 11 Aug 2010 13:10:16 -0400
-Subject: [PATCH] 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.
-
-[PG: in 34, nfs_file_fsync is just a wrapper around nfs_do_fsync,
- so the related code and actual change lands in nfs_do_fsync here.]
-
-Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
-Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-
-diff --git a/fs/nfs/file.c b/fs/nfs/file.c
-index 7f7df1d..1c91289 100644
---- a/fs/nfs/file.c
-+++ b/fs/nfs/file.c
-@@ -219,7 +219,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.4.4
-
diff --git a/queue/series b/queue/series
index 4b700e9..aa1a72d 100644
--- a/queue/series
+++ b/queue/series
@@ -106,7 +106,6 @@ CRED-Fix-get_task_cred-and-task_state-to-not-resurre.patch
 CRED-Fix-kernel-panic-upon-security_file_alloc-failu.patch
 CRED-Fix-BUG-upon-security_cred_alloc_blank-failure.patch
 CRED-Fix-memory-and-refcount-leaks-upon-security_pre.patch
-NFS-fix-the-return-value-of-nfs_file_fsync.patch
 isdn-hisax-Replace-the-bogus-access-to-irq-stats.patch
 nfsd-correctly-handle-return-value-from-nfsd_map_nam.patch
 xfs-always-use-iget-in-bulkstat.patch