3 files changed, 26 insertions, 52 deletions

diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 49eb37010aa3..a72de074172d 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -1823,19 +1823,11 @@ int sunrpc_cache_register_pipefs(struct dentry *parent,
                                  const char *name, umode_t umode,
                                  struct cache_detail *cd)
 {
-        struct qstr q;
-        struct dentry *dir;
-        int ret = 0;
-
-        q.name = name;
-        q.len = strlen(name);
-        q.hash = full_name_hash(q.name, q.len);
-        dir = rpc_create_cache_dir(parent, &q, umode, cd);
-        if (!IS_ERR(dir))
-                cd->u.pipefs.dir = dir;
-        else
-                ret = PTR_ERR(dir);
-        return ret;
+        struct dentry *dir = rpc_create_cache_dir(parent, name, umode, cd);
+        if (IS_ERR(dir))
+                return PTR_ERR(dir);
+        cd->u.pipefs.dir = dir;
+        return 0;
 }
 EXPORT_SYMBOL_GPL(sunrpc_cache_register_pipefs);
 
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index aa401560777b..9963584605c0 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -128,9 +128,7 @@ static struct dentry *rpc_setup_pipedir_sb(struct super_block *sb,
 {
         static uint32_t clntid;
         char name[15];
-        struct qstr q = { .name = name };
         struct dentry *dir, *dentry;
-        int error;
 
         dir = rpc_d_lookup_sb(sb, dir_name);
         if (dir == NULL) {
@@ -138,19 +136,17 @@ static struct dentry *rpc_setup_pipedir_sb(struct super_block *sb,
                 return dir;
         }
         for (;;) {
-                q.len = snprintf(name, sizeof(name), "clnt%x", (unsigned int)clntid++);
+                snprintf(name, sizeof(name), "clnt%x", (unsigned int)clntid++);
                 name[sizeof(name) - 1] = '\0';
-                q.hash = full_name_hash(q.name, q.len);
-                dentry = rpc_create_client_dir(dir, &q, clnt);
+                dentry = rpc_create_client_dir(dir, name, clnt);
                 if (!IS_ERR(dentry))
                         break;
-                error = PTR_ERR(dentry);
-                if (error != -EEXIST) {
-                        printk(KERN_INFO "RPC: Couldn't create pipefs entry"
-                                        " %s/%s, error %d\n",
-                                        dir_name, name, error);
-                        break;
-                }
+                if (dentry == ERR_PTR(-EEXIST))
+                        continue;
+                printk(KERN_INFO "RPC: Couldn't create pipefs entry"
+                                " %s/%s, error %ld\n",
+                                dir_name, name, PTR_ERR(dentry));
+                break;
         }
         dput(dir);
         return dentry;
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 61239a2cb786..406859cc68aa 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -673,13 +673,12 @@ static int __rpc_rmpipe(struct inode *dir, struct dentry *dentry)
 }
 
 static struct dentry *__rpc_lookup_create_exclusive(struct dentry *parent,
-                                          struct qstr *name)
+                                          const char *name)
 {
-        struct dentry *dentry;
-
-        dentry = d_lookup(parent, name);
+        struct qstr q = QSTR_INIT(name, strlen(name));
+        struct dentry *dentry = d_hash_and_lookup(parent, &q);
         if (!dentry) {
-                dentry = d_alloc(parent, name);
+                dentry = d_alloc(parent, &q);
                 if (!dentry)
                         return ERR_PTR(-ENOMEM);
         }
@@ -704,8 +703,7 @@ static void __rpc_depopulate(struct dentry *parent,
         for (i = start; i < eof; i++) {
                 name.name = files[i].name;
                 name.len = strlen(files[i].name);
-                name.hash = full_name_hash(name.name, name.len);
-                dentry = d_lookup(parent, &name);
+                dentry = d_hash_and_lookup(parent, &name);
 
                 if (dentry == NULL)
                         continue;
@@ -747,12 +745,7 @@ static int rpc_populate(struct dentry *parent,
 
         mutex_lock(&dir->i_mutex);
         for (i = start; i < eof; i++) {
-                struct qstr q;
-
-                q.name = files[i].name;
-                q.len = strlen(files[i].name);
-                q.hash = full_name_hash(q.name, q.len);
-                dentry = __rpc_lookup_create_exclusive(parent, &q);
+                dentry = __rpc_lookup_create_exclusive(parent, files[i].name);
                 err = PTR_ERR(dentry);
                 if (IS_ERR(dentry))
                         goto out_bad;
@@ -785,7 +778,7 @@ out_bad:
 }
 
 static struct dentry *rpc_mkdir_populate(struct dentry *parent,
-                struct qstr *name, umode_t mode, void *private,
+                const char *name, umode_t mode, void *private,
                 int (*populate)(struct dentry *, void *), void *args_populate)
 {
         struct dentry *dentry;
@@ -856,7 +849,6 @@ struct dentry *rpc_mkpipe_dentry(struct dentry *parent, const char *name,
         struct dentry *dentry;
         struct inode *dir = parent->d_inode;
         umode_t umode = S_IFIFO | S_IRUSR | S_IWUSR;
-        struct qstr q;
         int err;
 
         if (pipe->ops->upcall == NULL)
@@ -864,12 +856,8 @@ struct dentry *rpc_mkpipe_dentry(struct dentry *parent, const char *name,
         if (pipe->ops->downcall == NULL)
                 umode &= ~S_IWUGO;
 
-        q.name = name;
-        q.len = strlen(name);
-        q.hash = full_name_hash(q.name, q.len),
-
         mutex_lock_nested(&dir->i_mutex, I_MUTEX_PARENT);
-        dentry = __rpc_lookup_create_exclusive(parent, &q);
+        dentry = __rpc_lookup_create_exclusive(parent, name);
         if (IS_ERR(dentry))
                 goto out;
         err = __rpc_mkpipe_dentry(dir, dentry, umode, &rpc_pipe_fops,
@@ -940,8 +928,8 @@ static void rpc_clntdir_depopulate(struct dentry *dentry)
 
 /**
  * rpc_create_client_dir - Create a new rpc_client directory in rpc_pipefs
- * @dentry: dentry from the rpc_pipefs root to the new directory
- * @name: &struct qstr for the name
+ * @dentry: the parent of new directory
+ * @name: the name of new directory
  * @rpc_client: rpc client to associate with this directory
  *
  * This creates a directory at the given @path associated with
@@ -950,7 +938,7 @@ static void rpc_clntdir_depopulate(struct dentry *dentry)
  * later be created using rpc_mkpipe().
  */
 struct dentry *rpc_create_client_dir(struct dentry *dentry,
-                                   struct qstr *name,
+                                   const char *name,
                                    struct rpc_clnt *rpc_client)
 {
         return rpc_mkdir_populate(dentry, name, S_IRUGO | S_IXUGO, NULL,
@@ -996,7 +984,7 @@ static void rpc_cachedir_depopulate(struct dentry *dentry)
         rpc_depopulate(dentry, cache_pipefs_files, 0, 3);
 }
 
-struct dentry *rpc_create_cache_dir(struct dentry *parent, struct qstr *name,
+struct dentry *rpc_create_cache_dir(struct dentry *parent, const char *name,
                                     umode_t umode, struct cache_detail *cd)
 {
         return rpc_mkdir_populate(parent, name, umode, NULL,
@@ -1076,9 +1064,7 @@ struct dentry *rpc_d_lookup_sb(const struct super_block *sb,
                                const unsigned char *dir_name)
 {
         struct qstr dir = QSTR_INIT(dir_name, strlen(dir_name));
-
-        dir.hash = full_name_hash(dir.name, dir.len);
-        return d_lookup(sb->s_root, &dir);
+        return d_hash_and_lookup(sb->s_root, &dir);
 }
 EXPORT_SYMBOL_GPL(rpc_d_lookup_sb);