[PARISC] Fix Cirrus 6832 Cardbus on RDI Tadpole PARISC Laptop

[linux-2.6-omap-h63xx.git] / fs / autofs4 / expire.c

diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
index 500425e24fba9178c13db5550a7f9271256249d4..dc39589df165a049a465208949f9d22c760ce0c2 100644 (file)
--- a/fs/autofs4/expire.c
+++ b/fs/autofs4/expire.c
@@ -56,12 +56,9 @@ static int autofs4_check_mount(struct vfsmount *mnt, struct dentry *dentry)
        mntget(mnt);
        dget(dentry);
 
-       if (!follow_down(&mnt, &dentry))
+       if (!autofs4_follow_mount(&mnt, &dentry))
                goto done;
 
-       while (d_mountpoint(dentry) && follow_down(&mnt, &dentry))
-               ;
-
        /* This is an autofs submount, we can't expire it */
        if (is_autofs4_dentry(dentry))
                goto done;
@@ -108,7 +105,7 @@ repeat:
        next = this_parent->d_subdirs.next;
 resume:
        while (next != &this_parent->d_subdirs) {
-               struct dentry *dentry = list_entry(next, struct dentry, d_child);
+               struct dentry *dentry = list_entry(next, struct dentry, d_u.d_child);
 
                /* Negative dentry - give up */
                if (!simple_positive(dentry)) {
@@ -141,7 +138,7 @@ resume:
        }
 
        if (this_parent != top) {
-               next = this_parent->d_child.next;
+               next = this_parent->d_u.d_child.next;
                this_parent = this_parent->d_parent;
                goto resume;
        }
@@ -166,7 +163,7 @@ repeat:
        next = this_parent->d_subdirs.next;
 resume:
        while (next != &this_parent->d_subdirs) {
-               struct dentry *dentry = list_entry(next, struct dentry, d_child);
+               struct dentry *dentry = list_entry(next, struct dentry, d_u.d_child);
 
                /* Negative dentry - give up */
                if (!simple_positive(dentry)) {
@@ -202,7 +199,7 @@ cont:
        }
 
        if (this_parent != parent) {
-               next = this_parent->d_child.next;
+               next = this_parent->d_u.d_child.next;
                this_parent = this_parent->d_parent;
                goto resume;
        }
@@ -241,7 +238,7 @@ static struct dentry *autofs4_expire(struct super_block *sb,
        /* On exit from the loop expire is set to a dgot dentry
         * to expire or it's NULL */
        while ( next != &root->d_subdirs ) {
-               struct dentry *dentry = list_entry(next, struct dentry, d_child);
+               struct dentry *dentry = list_entry(next, struct dentry, d_u.d_child);
 
                /* Negative dentry - give up */
                if ( !simple_positive(dentry) ) {
@@ -305,7 +302,7 @@ next:
                        expired, (int)expired->d_name.len, expired->d_name.name);
                spin_lock(&dcache_lock);
                list_del(&expired->d_parent->d_subdirs);
-               list_add(&expired->d_parent->d_subdirs, &expired->d_child);
+               list_add(&expired->d_parent->d_subdirs, &expired->d_u.d_child);
                spin_unlock(&dcache_lock);
                return expired;
        }