Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into...

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

diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 3801bed94e458197d43809f0ed921a39d1268c35..11a6a9ae51b77442bd650a4d07574fee9a822336 100644 (file)
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -19,6 +19,7 @@
 #include <linux/parser.h>
 #include <linux/bitops.h>
 #include <linux/smp_lock.h>
+#include <linux/magic.h>
 #include "autofs_i.h"
 #include <linux/module.h>
 
@@ -157,8 +158,7 @@ static void autofs4_put_super(struct super_block *sb)
                autofs4_catatonic_mode(sbi); /* Free wait queues, close pipe */
 
        /* Clean up and release dangling references */
-       if (sbi)
-               autofs4_force_release(sbi);
+       autofs4_force_release(sbi);
 
        kfree(sbi);
 
@@ -178,9 +178,9 @@ static int autofs4_show_options(struct seq_file *m, struct vfsmount *mnt)
        seq_printf(m, ",minproto=%d", sbi->min_proto);
        seq_printf(m, ",maxproto=%d", sbi->max_proto);
 
-       if (sbi->type & AUTOFS_TYP_OFFSET)
+       if (sbi->type & AUTOFS_TYPE_OFFSET)
                seq_printf(m, ",offset");
-       else if (sbi->type & AUTOFS_TYP_DIRECT)
+       else if (sbi->type & AUTOFS_TYPE_DIRECT)
                seq_printf(m, ",direct");
        else
                seq_printf(m, ",indirect");
@@ -267,13 +267,13 @@ static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid,
                        *maxproto = option;
                        break;
                case Opt_indirect:
-                       *type = AUTOFS_TYP_INDIRECT;
+                       *type = AUTOFS_TYPE_INDIRECT;
                        break;
                case Opt_direct:
-                       *type = AUTOFS_TYP_DIRECT;
+                       *type = AUTOFS_TYPE_DIRECT;
                        break;
                case Opt_offset:
-                       *type = AUTOFS_TYP_DIRECT | AUTOFS_TYP_OFFSET;
+                       *type = AUTOFS_TYPE_DIRECT | AUTOFS_TYPE_OFFSET;
                        break;
                default:
                        return 1;
@@ -293,7 +293,6 @@ static struct autofs_info *autofs4_mkroot(struct autofs_sb_info *sbi)
        return ino;
 }
 
-void autofs4_dentry_release(struct dentry *);
 static struct dentry_operations autofs4_sb_dentry_operations = {
        .d_release      = autofs4_dentry_release,
 };
@@ -364,7 +363,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
        }
 
        root_inode->i_fop = &autofs4_root_operations;
-       root_inode->i_op = sbi->type & AUTOFS_TYP_DIRECT ?
+       root_inode->i_op = sbi->type & AUTOFS_TYPE_DIRECT ?
                        &autofs4_direct_root_inode_operations :
                        &autofs4_indirect_root_inode_operations;