rpms/kernel/devel linux-2.6-NFSD-cache_change_attribute-init.patch, NONE, 1.1 kernel-2.6.spec, 1.1733, 1.1734 linux-2.6-NFSD-revert-cache_change_attribute.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-NFSD-cache_change_attribute-init.patch 
Removed Files:
	linux-2.6-NFSD-revert-cache_change_attribute.patch 
Log Message:
better fix for 174010


linux-2.6-NFSD-cache_change_attribute-init.patch:
 inode.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE linux-2.6-NFSD-cache_change_attribute-init.patch ---
Make sure cache_change_attribute is initialized to jiffies
so when the mtime changes on directory, the directory
will be refreshed.

Signed-off by: Steve Dickson <steved at redhat.com>
---------------------------------------------
--- linux-2.6.14/fs/nfs/inode.c.orig	2005-11-29 20:53:57.000000000 -0500
+++ linux-2.6.14/fs/nfs/inode.c	2005-11-30 08:55:14.000000000 -0500
@@ -2066,6 +2066,7 @@ static struct inode *nfs_alloc_inode(str
 		return NULL;
 	nfsi->flags = 0UL;
 	nfsi->cache_validity = 0UL;
+	nfsi->cache_change_attribute = jiffies;
 #ifdef CONFIG_NFS_V3_ACL
 	nfsi->acl_access = ERR_PTR(-EAGAIN);
 	nfsi->acl_default = ERR_PTR(-EAGAIN);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1733
retrieving revision 1.1734
diff -u -r1.1733 -r1.1734
--- kernel-2.6.spec	1 Dec 2005 23:02:54 -0000	1.1733
+++ kernel-2.6.spec	2 Dec 2005 06:12:51 -0000	1.1734
@@ -307,7 +307,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-revert-cache_change_attribute.patch
+Patch1204: linux-2.6-NFSD-cache_change_attribute-init.patch
 
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
@@ -739,7 +739,7 @@
 # Fix badness.
 %patch1203 -p1
 # Revert a broken upstream patch (bz174010)
-%patch1204 -p1 -R
+%patch1204 -p1
 
 # NIC driver fixes.
 # New PCI ID for sundance driver.
@@ -1308,6 +1308,9 @@
 %endif
 
 %changelog
+* Fri Dec  2 2005 Dave Jones <davej at redhat.com>
+- Better fix for the NFSD cache_change_attribute fix. (#174010)
+
 * Thu Dec  1 2005 Dave Jones <davej at redhat.com>
 - 2.6.15-rc4
 - Flip default ioscheduler back to cfq.


--- linux-2.6-NFSD-revert-cache_change_attribute.patch DELETED ---