diff options
| author | Al Viro | 2013-07-14 14:43:54 +0200 |
|---|---|---|
| committer | Al Viro | 2013-07-14 15:02:28 +0200 |
| commit | a95e691f9c4a6e24fdeab6d7feae6d5411fe8a69 (patch) | |
| tree | ebe142c51935b977861e9d911a505bc63ef8ee29 /net/sunrpc/clnt.c | |
| parent | llist: llist_add() can use llist_add_batch() (diff) | |
| download | kernel-qcow2-linux-a95e691f9c4a6e24fdeab6d7feae6d5411fe8a69.tar.gz kernel-qcow2-linux-a95e691f9c4a6e24fdeab6d7feae6d5411fe8a69.tar.xz kernel-qcow2-linux-a95e691f9c4a6e24fdeab6d7feae6d5411fe8a69.zip | |
rpc_create_*_dir: don't bother with qstr
just pass the name
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/sunrpc/clnt.c')
| -rw-r--r-- | net/sunrpc/clnt.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 5a750b9c3640..26456274b24e 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; |