Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[linux.git] / fs / autofs / inode.c

diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c
index 078992eee299d0861236518643ee164f838e1e2a..80597b88718b205f363cd2d93500bb7c3c1b9b29 100644 (file)
--- a/fs/autofs/inode.c
+++ b/fs/autofs/inode.c
@@ -82,18 +82,20 @@ static int autofs_show_options(struct seq_file *m, struct dentry *root)
        seq_printf(m, ",maxproto=%d", sbi->max_proto);
 
        if (autofs_type_offset(sbi->type))
-               seq_printf(m, ",offset");
+               seq_puts(m, ",offset");
        else if (autofs_type_direct(sbi->type))
-               seq_printf(m, ",direct");
+               seq_puts(m, ",direct");
        else
-               seq_printf(m, ",indirect");
+               seq_puts(m, ",indirect");
        if (sbi->flags & AUTOFS_SBI_STRICTEXPIRE)
-               seq_printf(m, ",strictexpire");
+               seq_puts(m, ",strictexpire");
+       if (sbi->flags & AUTOFS_SBI_IGNORE)
+               seq_puts(m, ",ignore");
 #ifdef CONFIG_CHECKPOINT_RESTORE
        if (sbi->pipe)
                seq_printf(m, ",pipe_ino=%ld", file_inode(sbi->pipe)->i_ino);
        else
-               seq_printf(m, ",pipe_ino=-1");
+               seq_puts(m, ",pipe_ino=-1");
 #endif
        return 0;
 }
@@ -111,7 +113,8 @@ static const struct super_operations autofs_sops = {
 };
 
 enum {Opt_err, Opt_fd, Opt_uid, Opt_gid, Opt_pgrp, Opt_minproto, Opt_maxproto,
-       Opt_indirect, Opt_direct, Opt_offset, Opt_strictexpire};
+       Opt_indirect, Opt_direct, Opt_offset, Opt_strictexpire,
+       Opt_ignore};
 
 static const match_table_t tokens = {
        {Opt_fd, "fd=%u"},
@@ -124,6 +127,7 @@ static const match_table_t tokens = {
        {Opt_direct, "direct"},
        {Opt_offset, "offset"},
        {Opt_strictexpire, "strictexpire"},
+       {Opt_ignore, "ignore"},
        {Opt_err, NULL}
 };
 
@@ -206,6 +210,9 @@ static int parse_options(char *options,
                case Opt_strictexpire:
                        sbi->flags |= AUTOFS_SBI_STRICTEXPIRE;
                        break;
+               case Opt_ignore:
+                       sbi->flags |= AUTOFS_SBI_IGNORE;
+                       break;
                default:
                        return 1;
                }