[PATCH] autofs4: change AUTOFS_TYP_* AUTOFS_TYPE_*

Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
index 37c8d909d1e957e2076ea04289f79dd97233907e..ff6239d57b4b419ab21f8eaff1228d3dc3375e4d 100644 (file)
--- a/fs/autofs4/autofs_i.h
+++ b/fs/autofs4/autofs_i.h
@@ -91,9 +91,9 @@ struct autofs_wait_queue {
 
 #define AUTOFS_SBI_MAGIC 0x6d4a556d
 
-#define AUTOFS_TYP_INDIRECT     0x0001
-#define AUTOFS_TYP_DIRECT       0x0002
-#define AUTOFS_TYP_OFFSET       0x0004
+#define AUTOFS_TYPE_INDIRECT     0x0001
+#define AUTOFS_TYPE_DIRECT       0x0002
+#define AUTOFS_TYPE_OFFSET       0x0004
 
 struct autofs_sb_info {
        u32 magic;

diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
index 8fd92eaf936d2701d292fcc1d4deafeacd6024f0..08e33218a64ac0464e2a88f60577ac7c9f08735c 100644 (file)
--- a/fs/autofs4/expire.c
+++ b/fs/autofs4/expire.c
@@ -424,7 +424,7 @@ int autofs4_expire_multi(struct super_block *sb, struct vfsmount *mnt,
        if (arg && get_user(do_now, arg))
                return -EFAULT;
 
-       if (sbi->type & AUTOFS_TYP_DIRECT)
+       if (sbi->type & AUTOFS_TYPE_DIRECT)
                dentry = autofs4_expire_direct(sb, mnt, sbi, do_now);
        else
                dentry = autofs4_expire_indirect(sb, mnt, sbi, do_now);

diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 3801bed94e458197d43809f0ed921a39d1268c35..943888905493ac9693b5f73811384bb45910eee9 100644 (file)
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -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;
@@ -364,7 +364,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;
 

diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index 12da2c977b0a55be8b75ad496137a58740e32970..894d74671bd0ed8b571d70e43c1680f479b391d9 100644 (file)
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -207,7 +207,7 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
                return -ENOMEM;
 
        /* If this is a direct mount request create a dummy name */
-       if (IS_ROOT(dentry) && (sbi->type & AUTOFS_TYP_DIRECT))
+       if (IS_ROOT(dentry) && (sbi->type & AUTOFS_TYPE_DIRECT))
                len = sprintf(name, "%p", dentry);
        else {
                len = autofs4_getpath(sbi, dentry, &name);
@@ -283,11 +283,11 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
                                type = autofs_ptype_expire_multi;
                } else {
                        if (notify == NFY_MOUNT)
-                               type = (sbi->type & AUTOFS_TYP_DIRECT) ?
+                               type = (sbi->type & AUTOFS_TYPE_DIRECT) ?
                                        autofs_ptype_missing_direct :
                                         autofs_ptype_missing_indirect;
                        else
-                               type = (sbi->type & AUTOFS_TYP_DIRECT) ?
+                               type = (sbi->type & AUTOFS_TYPE_DIRECT) ?
                                        autofs_ptype_expire_direct :
                                        autofs_ptype_expire_indirect;
                }