Merge tag 'nfs-for-3.5-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux-2.6-block.git] / net / sunrpc / rpc_pipe.c

diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 88945d0f7594d9fa11a7c10a7d0ca302a9b1848a..04040476082e6efd5ef08f9c7e6444c0fec77929 100644 (file)
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -1057,12 +1057,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);