[kernel] r17401 - in dists/lenny/linux-2.6/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Mon May 16 00:56:38 2011
New Revision: 17401

Log:
NFS: fix the return value of nfs_file_fsync()

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/nfs-fix-the-return-value-of-nfs_file_fsync.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/27

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Mon May 16 00:56:30 2011	(r17400)
+++ dists/lenny/linux-2.6/debian/changelog	Mon May 16 00:56:38 2011	(r17401)
@@ -10,6 +10,7 @@
   * Include selected backports from 2.6.27.59:
     - scsi: fix medium error problems with some arrays which can cause
             data corruption
+    - NFS: fix the return value of nfs_file_fsync()
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 29 Nov 2010 02:01:24 +0000
 

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/nfs-fix-the-return-value-of-nfs_file_fsync.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/nfs-fix-the-return-value-of-nfs_file_fsync.patch	Mon May 16 00:56:38 2011	(r17401)
@@ -0,0 +1,30 @@
+commit fb35bcad2fe725cace7d25e03952ecd1a46da557
+Author: J. R. Okajima <hooanon05 at yahoo.co.jp>
+Date:   Wed Aug 11 13:10:16 2010 -0400
+
+    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 at yahoo.co.jp>
+    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
+    Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+diff --git a/fs/nfs/file.c b/fs/nfs/file.c
+index e5a0874..7e11f13 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;
+ }

Modified: dists/lenny/linux-2.6/debian/patches/series/27
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/27	Mon May 16 00:56:30 2011	(r17400)
+++ dists/lenny/linux-2.6/debian/patches/series/27	Mon May 16 00:56:38 2011	(r17401)
@@ -2,3 +2,4 @@
 + bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch
 + bugfix/all/rt2x00-Fix-memleak-when-RTS-CTS-fails.patch
 + bugfix/all/fix-medium-error-problems-with-some-arrays-which-can-cause-data-corruption.patch
++ bugfix/all/nfs-fix-the-return-value-of-nfs_file_fsync.patch