summaryrefslogtreecommitdiffstats
path: root/fs/autofs4/inode.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2011-01-15 10:51:57 +0000
committerAl Viro <viro@zeniv.linux.org.uk>2011-01-15 20:07:49 -0500
commitb650c858c26bd9ba29ebc82d30f09355845a294a (patch)
treecd3749a722a81425263e3a2b1d82898586665acf /fs/autofs4/inode.c
parentea5b778a8b98c85a87d66bf844904f9c3802b869 (diff)
downloadop-kernel-dev-b650c858c26bd9ba29ebc82d30f09355845a294a.zip
op-kernel-dev-b650c858c26bd9ba29ebc82d30f09355845a294a.tar.gz
autofs4: Merge the remaining dentry ops tables
Merge the remaining autofs4 dentry ops tables. It doesn't matter if d_automount and d_manage are present on something that's not mountable or holdable as these ops are only used if the appropriate flags are set in dentry->d_flags. [AV] switch to ->s_d_op, since now _everything_ on autofs4 is using the same dentry_operations. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/autofs4/inode.c')
-rw-r--r--fs/autofs4/inode.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 3ecd2e2..9e1a9da 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -276,6 +276,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
s->s_blocksize_bits = 10;
s->s_magic = AUTOFS_SUPER_MAGIC;
s->s_op = &autofs4_sops;
+ s->s_d_op = &autofs4_dentry_operations;
s->s_time_gran = 1;
/*
@@ -293,7 +294,6 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
goto fail_iput;
pipe = NULL;
- d_set_d_op(root, &autofs4_dentry_operations);
root->d_fsdata = ino;
/* Can this call block? */
@@ -304,10 +304,8 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
goto fail_dput;
}
- if (autofs_type_trigger(sbi->type)) {
- d_set_d_op(root, &autofs4_mount_dentry_operations);
+ if (autofs_type_trigger(sbi->type))
__managed_dentry_set_managed(root);
- }
root_inode->i_fop = &autofs4_root_operations;
root_inode->i_op = &autofs4_dir_inode_operations;
OpenPOWER on IntegriCloud