Commit d463a0c4b53a8fab505fd9aa3a1a04cb9f411b78
1 parent
31a203df9c
Exists in
master
and in
4 other branches
switch configfs
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Showing 3 changed files with 3 additions and 5 deletions Side-by-side Diff
fs/configfs/configfs_internal.h
... | ... | @@ -90,6 +90,7 @@ |
90 | 90 | extern const struct file_operations bin_fops; |
91 | 91 | extern const struct inode_operations configfs_dir_inode_operations; |
92 | 92 | extern const struct inode_operations configfs_symlink_inode_operations; |
93 | +extern const struct dentry_operations configfs_dentry_ops; | |
93 | 94 | |
94 | 95 | extern int configfs_symlink(struct inode *dir, struct dentry *dentry, |
95 | 96 | const char *symname); |
fs/configfs/dir.c
... | ... | @@ -72,7 +72,7 @@ |
72 | 72 | return 1; |
73 | 73 | } |
74 | 74 | |
75 | -static const struct dentry_operations configfs_dentry_ops = { | |
75 | +const struct dentry_operations configfs_dentry_ops = { | |
76 | 76 | .d_iput = configfs_d_iput, |
77 | 77 | /* simple_delete_dentry() isn't exported */ |
78 | 78 | .d_delete = configfs_d_delete, |
... | ... | @@ -442,7 +442,6 @@ |
442 | 442 | return error; |
443 | 443 | } |
444 | 444 | |
445 | - d_set_d_op(dentry, &configfs_dentry_ops); | |
446 | 445 | d_rehash(dentry); |
447 | 446 | |
448 | 447 | return 0; |
... | ... | @@ -489,7 +488,6 @@ |
489 | 488 | */ |
490 | 489 | if (dentry->d_name.len > NAME_MAX) |
491 | 490 | return ERR_PTR(-ENAMETOOLONG); |
492 | - d_set_d_op(dentry, &configfs_dentry_ops); | |
493 | 491 | d_add(dentry, NULL); |
494 | 492 | return NULL; |
495 | 493 | } |
... | ... | @@ -683,7 +681,6 @@ |
683 | 681 | ret = -ENOMEM; |
684 | 682 | child = d_alloc(parent, &name); |
685 | 683 | if (child) { |
686 | - d_set_d_op(child, &configfs_dentry_ops); | |
687 | 684 | d_add(child, NULL); |
688 | 685 | |
689 | 686 | ret = configfs_attach_group(&parent_group->cg_item, |
... | ... | @@ -1681,7 +1678,6 @@ |
1681 | 1678 | err = -ENOMEM; |
1682 | 1679 | dentry = d_alloc(configfs_sb->s_root, &name); |
1683 | 1680 | if (dentry) { |
1684 | - d_set_d_op(dentry, &configfs_dentry_ops); | |
1685 | 1681 | d_add(dentry, NULL); |
1686 | 1682 | |
1687 | 1683 | err = configfs_attach_group(sd->s_element, &group->cg_item, |
fs/configfs/mount.c