summaryrefslogtreecommitdiffstats
path: root/fs/configfs/inode.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-03-07 20:25:46 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2016-03-14 05:15:55 +0100
commit5cf3b560af903c82e9fc12578fac2fbcb8ca1533 (patch)
tree690f56e3adb5366db3a48ef457269610f4ab284a /fs/configfs/inode.c
parentceph: don't bother with d_rehash() in splice_dentry() (diff)
downloadlinux-5cf3b560af903c82e9fc12578fac2fbcb8ca1533.tar.xz
linux-5cf3b560af903c82e9fc12578fac2fbcb8ca1533.zip
configfs: move d_rehash() into configfs_create() for regular files
... and turn it into d_add in there Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/configfs/inode.c')
-rw-r--r--fs/configfs/inode.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c
index cee087d8f7e0..45811ea3fd87 100644
--- a/fs/configfs/inode.c
+++ b/fs/configfs/inode.c
@@ -199,9 +199,17 @@ int configfs_create(struct dentry * dentry, umode_t mode, void (*init)(struct in
configfs_set_inode_lock_class(sd, inode);
init(inode);
- d_instantiate(dentry, inode);
- if (S_ISDIR(mode) || S_ISLNK(mode))
+ if (S_ISDIR(mode) || S_ISLNK(mode)) {
+ /*
+ * ->symlink(), ->mkdir(), configfs_register_subsystem() or
+ * create_default_group() - already hashed.
+ */
+ d_instantiate(dentry, inode);
dget(dentry); /* pin link and directory dentries in core */
+ } else {
+ /* ->lookup() */
+ d_add(dentry, inode);
+ }
return error;
}