diff options
author | Ian Kent <raven@themaw.net> | 2006-03-27 04:14:54 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 11:44:40 -0500 |
commit | 34ca959cfc15cf09ad4da4f31ab034691e51af78 (patch) | |
tree | 83bbe0a2b94ca58f39c65b1e605f44d421b9564b /fs/autofs4/autofs_i.h | |
parent | 051d381259eb57d6074d02a6ba6e90e744f1a29f (diff) |
[PATCH] autofs4: add v5 follow_link mount trigger method
This patch adds a follow_link inode method for the root of an autofs direct
mount trigger. It also adds the corresponding mount options and updates the
show_mount method.
Signed-off-by: Ian Kent <raven@themaw.net>
Cc: Al Viro <viro@ftp.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/autofs4/autofs_i.h')
-rw-r--r-- | fs/autofs4/autofs_i.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h index bc1b0543d2b6..ed388a1d8fc4 100644 --- a/fs/autofs4/autofs_i.h +++ b/fs/autofs4/autofs_i.h | |||
@@ -3,6 +3,7 @@ | |||
3 | * linux/fs/autofs/autofs_i.h | 3 | * linux/fs/autofs/autofs_i.h |
4 | * | 4 | * |
5 | * Copyright 1997-1998 Transmeta Corporation - All Rights Reserved | 5 | * Copyright 1997-1998 Transmeta Corporation - All Rights Reserved |
6 | * Copyright 2005-2006 Ian Kent <raven@themaw.net> | ||
6 | * | 7 | * |
7 | * This file is part of the Linux kernel and is made available under | 8 | * This file is part of the Linux kernel and is made available under |
8 | * the terms of the GNU General Public License, version 2, or at your | 9 | * the terms of the GNU General Public License, version 2, or at your |
@@ -84,6 +85,10 @@ struct autofs_wait_queue { | |||
84 | 85 | ||
85 | #define AUTOFS_SBI_MAGIC 0x6d4a556d | 86 | #define AUTOFS_SBI_MAGIC 0x6d4a556d |
86 | 87 | ||
88 | #define AUTOFS_TYP_INDIRECT 0x0001 | ||
89 | #define AUTOFS_TYP_DIRECT 0x0002 | ||
90 | #define AUTOFS_TYP_OFFSET 0x0004 | ||
91 | |||
87 | struct autofs_sb_info { | 92 | struct autofs_sb_info { |
88 | u32 magic; | 93 | u32 magic; |
89 | struct dentry *root; | 94 | struct dentry *root; |
@@ -96,6 +101,7 @@ struct autofs_sb_info { | |||
96 | int min_proto; | 101 | int min_proto; |
97 | int max_proto; | 102 | int max_proto; |
98 | unsigned long exp_timeout; | 103 | unsigned long exp_timeout; |
104 | unsigned int type; | ||
99 | int reghost_enabled; | 105 | int reghost_enabled; |
100 | int needs_reghost; | 106 | int needs_reghost; |
101 | struct super_block *sb; | 107 | struct super_block *sb; |
@@ -162,6 +168,8 @@ int autofs4_expire_multi(struct super_block *, struct vfsmount *, | |||
162 | extern struct inode_operations autofs4_symlink_inode_operations; | 168 | extern struct inode_operations autofs4_symlink_inode_operations; |
163 | extern struct inode_operations autofs4_dir_inode_operations; | 169 | extern struct inode_operations autofs4_dir_inode_operations; |
164 | extern struct inode_operations autofs4_root_inode_operations; | 170 | extern struct inode_operations autofs4_root_inode_operations; |
171 | extern struct inode_operations autofs4_indirect_root_inode_operations; | ||
172 | extern struct inode_operations autofs4_direct_root_inode_operations; | ||
165 | extern struct file_operations autofs4_dir_operations; | 173 | extern struct file_operations autofs4_dir_operations; |
166 | extern struct file_operations autofs4_root_operations; | 174 | extern struct file_operations autofs4_root_operations; |
167 | 175 | ||