Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull more vfs stuff from Al Viro:
 "O_TMPFILE ABI changes, Oleg's fput() series, misc cleanups, including
  making simple_lookup() usable for filesystems with non-NULL s_d_op,
  which allows us to get rid of quite a bit of ugliness"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  sunrpc: now we can just set ->s_d_op
  cgroup: we can use simple_lookup() now
  efivarfs: we can use simple_lookup() now
  make simple_lookup() usable for filesystems that set ->s_d_op
  configfs: don't open-code d_alloc_name()
  __rpc_lookup_create_exclusive: pass string instead of qstr
  rpc_create_*_dir: don't bother with qstr
  llist: llist_add() can use llist_add_batch()
  llist: fix/simplify llist_add() and llist_add_batch()
  fput: turn "list_head delayed_fput_list" into llist_head
  fs/file_table.c:fput(): add comment
  Safer ABI for O_TMPFILE

1 files changed, 2 insertions, 11 deletions

diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 5e7c60c1cb63..277bd1be21fd 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -660,19 +660,15 @@ static int create_default_group(struct config_group *parent_group,
                                 struct config_group *group)
 {
         int ret;
-        struct qstr name;
         struct configfs_dirent *sd;
         /* We trust the caller holds a reference to parent */
         struct dentry *child, *parent = parent_group->cg_item.ci_dentry;
 
         if (!group->cg_item.ci_name)
                 group->cg_item.ci_name = group->cg_item.ci_namebuf;
-        name.name = group->cg_item.ci_name;
-        name.len = strlen(name.name);
-        name.hash = full_name_hash(name.name, name.len);
 
         ret = -ENOMEM;
-        child = d_alloc(parent, &name);
+        child = d_alloc_name(parent, group->cg_item.ci_name);
         if (child) {
                 d_add(child, NULL);
 
@@ -1650,7 +1646,6 @@ int configfs_register_subsystem(struct configfs_subsystem *subsys)
 {
         int err;
         struct config_group *group = &subsys->su_group;
-        struct qstr name;
         struct dentry *dentry;
         struct dentry *root;
         struct configfs_dirent *sd;
@@ -1667,12 +1662,8 @@ int configfs_register_subsystem(struct configfs_subsystem *subsys)
 
         mutex_lock_nested(&root->d_inode->i_mutex, I_MUTEX_PARENT);
 
-        name.name = group->cg_item.ci_name;
-        name.len = strlen(name.name);
-        name.hash = full_name_hash(name.name, name.len);
-
         err = -ENOMEM;
-        dentry = d_alloc(root, &name);
+        dentry = d_alloc_name(root, group->cg_item.ci_name);
         if (dentry) {
                 d_add(dentry, NULL);