summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
1f5f2c3)
Simplify the expire tree traversal code by using a function from namespace.c
to calculate the next entry in the top down tree traversals carried out during
the expire operation.
Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+/*
+ * Calculate next entry in top down tree traversal.
+ * From next_mnt in namespace.c - elegant.
+ */
+static struct dentry *next_dentry(struct dentry *p, struct dentry *root)
+{
+ struct list_head *next = p->d_subdirs.next;
+
+ if (next == &p->d_subdirs) {
+ while (1) {
+ if (p == root)
+ return NULL;
+ next = p->d_u.d_child.next;
+ if (next != &p->d_parent->d_subdirs)
+ break;
+ p = p->d_parent;
+ }
+ }
+ return list_entry(next, struct dentry, d_u.d_child);
+}
+
/* Check a directory tree of mount points for busyness
* The tree is not busy iff no mountpoints are busy
*/
/* Check a directory tree of mount points for busyness
* The tree is not busy iff no mountpoints are busy
*/
unsigned long timeout,
int do_now)
{
unsigned long timeout,
int do_now)
{
- struct dentry *this_parent = top;
- struct list_head *next;
DPRINTK("top %p %.*s",
top, (int)top->d_name.len, top->d_name.name);
DPRINTK("top %p %.*s",
top, (int)top->d_name.len, top->d_name.name);
return 1;
spin_lock(&dcache_lock);
return 1;
spin_lock(&dcache_lock);
-repeat:
- next = this_parent->d_subdirs.next;
-resume:
- while (next != &this_parent->d_subdirs) {
- struct dentry *dentry = list_entry(next, struct dentry, d_u.d_child);
-
+ for (p = top; p; p = next_dentry(p, top)) {
/* Negative dentry - give up */
/* Negative dentry - give up */
- if (!simple_positive(dentry)) {
- next = next->next;
+ if (!simple_positive(p))
DPRINTK("dentry %p %.*s",
DPRINTK("dentry %p %.*s",
- dentry, (int)dentry->d_name.len, dentry->d_name.name);
-
- if (!simple_empty_nolock(dentry)) {
- this_parent = dentry;
- goto repeat;
- }
+ p, (int) p->d_name.len, p->d_name.name);
spin_unlock(&dcache_lock);
spin_unlock(&dcache_lock);
- if (d_mountpoint(dentry)) {
/* First busy => tree busy */
/* First busy => tree busy */
- if (autofs4_mount_busy(mnt, dentry)) {
- dput(dentry);
+ if (autofs4_mount_busy(mnt, p)) {
+ dput(p);
- next = next->next;
- }
-
- if (this_parent != top) {
- next = this_parent->d_u.d_child.next;
- this_parent = this_parent->d_parent;
- goto resume;
}
spin_unlock(&dcache_lock);
}
spin_unlock(&dcache_lock);
unsigned long timeout,
int do_now)
{
unsigned long timeout,
int do_now)
{
- struct dentry *this_parent = parent;
- struct list_head *next;
DPRINTK("parent %p %.*s",
parent, (int)parent->d_name.len, parent->d_name.name);
spin_lock(&dcache_lock);
DPRINTK("parent %p %.*s",
parent, (int)parent->d_name.len, parent->d_name.name);
spin_lock(&dcache_lock);
-repeat:
- next = this_parent->d_subdirs.next;
-resume:
- while (next != &this_parent->d_subdirs) {
- struct dentry *dentry = list_entry(next, struct dentry, d_u.d_child);
-
+ for (p = parent; p; p = next_dentry(p, parent)) {
/* Negative dentry - give up */
/* Negative dentry - give up */
- if (!simple_positive(dentry)) {
- next = next->next;
+ if (!simple_positive(p))
DPRINTK("dentry %p %.*s",
DPRINTK("dentry %p %.*s",
- dentry, (int)dentry->d_name.len, dentry->d_name.name);
+ p, (int) p->d_name.len, p->d_name.name);
- if (!list_empty(&dentry->d_subdirs)) {
- this_parent = dentry;
- goto repeat;
- }
-
- dentry = dget(dentry);
spin_unlock(&dcache_lock);
spin_unlock(&dcache_lock);
- if (d_mountpoint(dentry)) {
/* Can we expire this guy */
/* Can we expire this guy */
- if (!autofs4_can_expire(dentry, timeout, do_now))
+ if (!autofs4_can_expire(p, timeout, do_now))
goto cont;
/* Can we umount this guy */
goto cont;
/* Can we umount this guy */
- if (!autofs4_mount_busy(mnt, dentry))
- return dentry;
+ if (!autofs4_mount_busy(mnt, p))
+ return p;
- next = next->next;
- }
-
- if (this_parent != parent) {
- next = this_parent->d_u.d_child.next;
- this_parent = this_parent->d_parent;
- goto resume;
}
spin_unlock(&dcache_lock);
}
spin_unlock(&dcache_lock);