Commit e61da20a50d21725ff27571a6dff9468e4fb7146
Committed by
Al Viro
Al Viro
1 parent
8c13a676d5
Exists in
master
and in
4 other branches
autofs4: Clean up inode operations
Since the use of ->follow_link() has been eliminated there is no need to separate the indirect and direct inode operations. Signed-off-by: Ian Kent <raven@themaw.net> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Showing 3 changed files with 1 additions and 21 deletions Side-by-side Diff
fs/autofs4/autofs_i.h
| ... | ... | @@ -204,9 +204,6 @@ |
| 204 | 204 | |
| 205 | 205 | extern const struct inode_operations autofs4_symlink_inode_operations; |
| 206 | 206 | extern const struct inode_operations autofs4_dir_inode_operations; |
| 207 | -extern const struct inode_operations autofs4_root_inode_operations; | |
| 208 | -extern const struct inode_operations autofs4_indirect_root_inode_operations; | |
| 209 | -extern const struct inode_operations autofs4_direct_root_inode_operations; | |
| 210 | 207 | extern const struct file_operations autofs4_dir_operations; |
| 211 | 208 | extern const struct file_operations autofs4_root_operations; |
| 212 | 209 |
fs/autofs4/inode.c
| ... | ... | @@ -326,9 +326,7 @@ |
| 326 | 326 | __managed_dentry_set_managed(root); |
| 327 | 327 | |
| 328 | 328 | root_inode->i_fop = &autofs4_root_operations; |
| 329 | - root_inode->i_op = autofs_type_trigger(sbi->type) ? | |
| 330 | - &autofs4_direct_root_inode_operations : | |
| 331 | - &autofs4_indirect_root_inode_operations; | |
| 329 | + root_inode->i_op = &autofs4_dir_inode_operations; | |
| 332 | 330 | |
| 333 | 331 | /* Couldn't this be tested earlier? */ |
| 334 | 332 | if (sbi->max_proto < AUTOFS_MIN_PROTO_VERSION || |
fs/autofs4/root.c
| ... | ... | @@ -56,21 +56,6 @@ |
| 56 | 56 | .llseek = dcache_dir_lseek, |
| 57 | 57 | }; |
| 58 | 58 | |
| 59 | -const struct inode_operations autofs4_indirect_root_inode_operations = { | |
| 60 | - .lookup = autofs4_lookup, | |
| 61 | - .unlink = autofs4_dir_unlink, | |
| 62 | - .symlink = autofs4_dir_symlink, | |
| 63 | - .mkdir = autofs4_dir_mkdir, | |
| 64 | - .rmdir = autofs4_dir_rmdir, | |
| 65 | -}; | |
| 66 | - | |
| 67 | -const struct inode_operations autofs4_direct_root_inode_operations = { | |
| 68 | - .lookup = autofs4_lookup, | |
| 69 | - .unlink = autofs4_dir_unlink, | |
| 70 | - .mkdir = autofs4_dir_mkdir, | |
| 71 | - .rmdir = autofs4_dir_rmdir, | |
| 72 | -}; | |
| 73 | - | |
| 74 | 59 | const struct inode_operations autofs4_dir_inode_operations = { |
| 75 | 60 | .lookup = autofs4_lookup, |
| 76 | 61 | .unlink = autofs4_dir_unlink, |