Merge with /home/shaggy/git/linus-clean/

1 files changed, 16 insertions, 12 deletions

diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 2a771ec66956..62d8d4acb8bb 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -12,6 +12,7 @@
  *
  * ------------------------------------------------------------------------- */
 
+#include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/stat.h>
 #include <linux/param.h>
@@ -86,7 +87,7 @@ static int autofs4_root_readdir(struct file *file, void *dirent,
 
 /* Update usage from here to top of tree, so that scan of
    top-level directories will give a useful result */
-static void autofs4_update_usage(struct dentry *dentry)
+static void autofs4_update_usage(struct vfsmount *mnt, struct dentry *dentry)
 {
         struct dentry *top = dentry->d_sb->s_root;
 
@@ -95,7 +96,7 @@ static void autofs4_update_usage(struct dentry *dentry)
                 struct autofs_info *ino = autofs4_dentry_ino(dentry);
 
                 if (ino) {
-                        update_atime(dentry->d_inode);
+                        touch_atime(mnt, dentry);
                         ino->last_used = jiffies;
                 }
         }
@@ -143,7 +144,8 @@ static int autofs4_dcache_readdir(struct file * filp, void * dirent, filldir_t f
                         }
 
                         while(1) {
-                                struct dentry *de = list_entry(list, struct dentry, d_child);
+                                struct dentry *de = list_entry(list,
+                                                struct dentry, d_u.d_child);
 
                                 if (!d_unhashed(de) && de->d_inode) {
                                         spin_unlock(&dcache_lock);
@@ -193,6 +195,8 @@ static int autofs4_dir_open(struct inode *inode, struct file *file)
                 if (!empty)
                         d_invalidate(dentry);
 
+                nd.dentry = dentry;
+                nd.mnt = mnt;
                 nd.flags = LOOKUP_DIRECTORY;
                 status = (dentry->d_op->d_revalidate)(dentry, &nd);
 
@@ -288,10 +292,10 @@ out:
         return autofs4_dcache_readdir(file, dirent, filldir);
 }
 
-static int try_to_fill_dentry(struct dentry *dentry, 
-                              struct super_block *sb,
-                              struct autofs_sb_info *sbi, int flags)
+static int try_to_fill_dentry(struct vfsmount *mnt, struct dentry *dentry, int flags)
 {
+        struct super_block *sb = mnt->mnt_sb;
+        struct autofs_sb_info *sbi = autofs4_sbi(sb);
         struct autofs_info *de_info = autofs4_dentry_ino(dentry);
         int status = 0;
 
@@ -366,7 +370,7 @@ static int try_to_fill_dentry(struct dentry *dentry,
         /* We don't update the usages for the autofs daemon itself, this
            is necessary for recursive autofs mounts */
         if (!autofs4_oz_mode(sbi))
-                autofs4_update_usage(dentry);
+                autofs4_update_usage(mnt, dentry);
 
         spin_lock(&dentry->d_lock);
         dentry->d_flags &= ~DCACHE_AUTOFS_PENDING;
@@ -391,7 +395,7 @@ static int autofs4_revalidate(struct dentry * dentry, struct nameidata *nd)
         /* Pending dentry */
         if (autofs4_ispending(dentry)) {
                 if (!oz_mode)
-                        status = try_to_fill_dentry(dentry, dir->i_sb, sbi, flags);
+                        status = try_to_fill_dentry(nd->mnt, dentry, flags);
                 return status;
         }
 
@@ -408,14 +412,14 @@ static int autofs4_revalidate(struct dentry * dentry, struct nameidata *nd)
                          dentry, dentry->d_name.len, dentry->d_name.name);
                 spin_unlock(&dcache_lock);
                 if (!oz_mode)
-                        status = try_to_fill_dentry(dentry, dir->i_sb, sbi, flags);
+                        status = try_to_fill_dentry(nd->mnt, dentry, flags);
                 return status;
         }
         spin_unlock(&dcache_lock);
 
         /* Update the usage list */
         if (!oz_mode)
-                autofs4_update_usage(dentry);
+                autofs4_update_usage(nd->mnt, dentry);
 
         return 1;
 }
@@ -488,9 +492,9 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s
         d_add(dentry, NULL);
 
         if (dentry->d_op && dentry->d_op->d_revalidate) {
-                up(&dir->i_sem);
+                mutex_unlock(&dir->i_mutex);
                 (dentry->d_op->d_revalidate)(dentry, nd);
-                down(&dir->i_sem);
+                mutex_lock(&dir->i_mutex);
         }
 
         /*