rpms/kernel/devel linux-2.6-autofs-invalidate.patch, NONE, 1.1 kernel-2.6.spec, 1.2269, 1.2270
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jun 12 16:45:55 UTC 2006
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29599
Modified Files:
kernel-2.6.spec
Added Files:
linux-2.6-autofs-invalidate.patch
Log Message:
autofs4 - need to invalidate children on tree mount expire
linux-2.6-autofs-invalidate.patch:
expire.c | 6 ++++++
1 files changed, 6 insertions(+)
--- NEW FILE linux-2.6-autofs-invalidate.patch ---
From: Ian Kent <raven at themaw.net>
To: Andrew Morton <akpm at osdl.org>
Cc: autofs mailing list <autofs at linux.kernel.org>, Kernel Mailing List
<linux-kernel at vger.kernel.org>, linux-fsdevel
<linux-fsdevel at vger.kernel.org>
Subject: [PATCH] autofs4 - need to invalidate children on tree mount expire
Date: Mon, 12 Jun 2006 14:52:45 +0800 (WST)
Hi Andrew,
I've found a case where invalid dentrys in a mount tree, waiting to be
cleaned up by d_invalidate, prevent the expected expire.
In this case dentrys created during a lookup for which a mount fails or
has no entry in the mount map contribute to the d_count of the parent
dentry. These dentrys may not be invalidated prior to comparing the
interanl usage count of valid autofs dentrys against the dentry d_count
which makes a mount tree appear busy so it doesn't expire.
Signed-off-by: Ian Kent <raven at themaw.net>
--
--- linux-2.6.17-rc6-mm2/fs/autofs4/expire.c.need-invalidate-on-tree-expire 2006-06-12 14:24:21.000000000 +0800
+++ linux-2.6.17-rc6-mm2/fs/autofs4/expire.c 2006-06-12 14:24:36.000000000 +0800
@@ -174,6 +174,12 @@ static int autofs4_tree_busy(struct vfsm
struct autofs_info *ino = autofs4_dentry_ino(p);
unsigned int ino_count = atomic_read(&ino->count);
+ /*
+ * Clean stale dentries below that have not been
+ * invalidated after a mount fail during lookup
+ */
+ d_invalidate(p);
+
/* allow for dget above and top is already dgot */
if (p == top)
ino_count += 2;
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2269
retrieving revision 1.2270
diff -u -r1.2269 -r1.2270
--- kernel-2.6.spec 12 Jun 2006 13:04:19 -0000 1.2269
+++ kernel-2.6.spec 12 Jun 2006 16:45:53 -0000 1.2270
@@ -378,6 +378,7 @@
Patch1660: linux-2.6-valid-ether-addr.patch
Patch1670: linux-2.6-softcursor-persistent-alloc.patch
Patch1680: linux-2.6-usb-unusual-devices.patch
+Patch1690: linux-2.6-autofs-invalidate.patch
Patch1700: linux-2.6-w1-hush-debug.patch
Patch1710: linux-2.6-sched-up-migration-cost.patch
Patch1720: linux-2.6-proc-self-maps-fix.patch
@@ -1035,6 +1036,8 @@
%patch1670 -p1
# Add some USB devices to the unusual quirk list.
%patch1680 -p1
+# autofs4 - need to invalidate children on tree mount expire
+%patch1690 -p1
# Silence debug messages in w1
%patch1700 -p1
# Only print migration info on SMP
@@ -1821,6 +1824,7 @@
%changelog
* Mon Jun 12 2006 Dave Jones <davej at redhat.com>
- 2.6.17-rc6-git3
+- autofs4 - need to invalidate children on tree mount expire
* Sun Jun 11 2006 Dave Jones <davej at redhat.com>
- 2.6.17-rc6-git2
More information about the fedora-cvs-commits
mailing list