rpms/kernel/devel linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch, NONE, 1.1 kernel-2.6.spec, 1.2005, 1.2006

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28658

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch 
Log Message:
NFS: writes should not clobber utimes() calls


linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch:
 inode.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch ---
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
NFS: writes should not clobber utimes() calls

Ensure that we flush out writes in the case when someone calls utimes() in
order to set the file times.

Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
---

 fs/nfs/inode.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index a77ee95..0524a20 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -859,11 +859,9 @@ nfs_setattr(struct dentry *dentry, struc
 
 	lock_kernel();
 	nfs_begin_data_update(inode);
-	/* Write all dirty data if we're changing file permissions or size */
-	if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_SIZE)) != 0) {
-		filemap_write_and_wait(inode->i_mapping);
-		nfs_wb_all(inode);
-	}
+	/* Write all dirty data */
+	filemap_write_and_wait(inode->i_mapping);
+	nfs_wb_all(inode);
 	/*
 	 * Return any delegations if we're going to change ACLs
 	 */


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2005
retrieving revision 1.2006
diff -u -r1.2005 -r1.2006
--- kernel-2.6.spec	2 Mar 2006 04:47:18 -0000	1.2005
+++ kernel-2.6.spec	2 Mar 2006 04:59:46 -0000	1.2006
@@ -332,6 +332,7 @@
 Patch1200: linux-2.6-NFSD-non-null-getxattr.patch
 Patch1201: linux-2.6-NFSD-ctlbits.patch
 Patch1203: linux-2.6-NFSD-badness.patch
+Patch1204: linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch
 
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
@@ -888,6 +889,8 @@
 %patch1201 -p1
 # Fix badness.
 %patch1203 -p1
+# NFSD: writes should not clobber utimes() calls
+%patch1204 -p1
 
 # NIC driver fixes.
 # New PCI ID for sundance driver.
@@ -1596,6 +1599,7 @@
 - Fix leak in RAID1
 - Further fixing of selinuxfs link count. (#182001)
 - Enable PATA ports on Promise SATA. (#179369)
+- NFS: writes should not clobber utimes() calls. (#183208)
 
 * Tue Feb 28 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc5-git3