2 files changed, 3 insertions, 8 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index adf2990acebf..7fee13b331d1 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -127,9 +127,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 qstr q = { .name = name };
         struct dentry *dir, *dentry;
         int error;
 
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 3b62cf288031..fd2423991c2d 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -1059,12 +1059,9 @@ static const struct rpc_filelist files[] = {
 struct dentry *rpc_d_lookup_sb(const struct super_block *sb,
                                const unsigned char *dir_name)
 {
-        struct qstr dir = {
-                .name = dir_name,
-                .len = strlen(dir_name),
-                .hash = full_name_hash(dir_name, strlen(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);
 }
 EXPORT_SYMBOL_GPL(rpc_d_lookup_sb);