aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/idmap.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index ffb8df91dc34..1d0a5bf0d264 100644
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -66,7 +66,6 @@ struct idmap_hashtable {
66}; 66};
67 67
68struct idmap { 68struct idmap {
69 char idmap_path[48];
70 struct dentry *idmap_dentry; 69 struct dentry *idmap_dentry;
71 wait_queue_head_t idmap_wq; 70 wait_queue_head_t idmap_wq;
72 struct idmap_msg idmap_im; 71 struct idmap_msg idmap_im;
@@ -102,11 +101,8 @@ nfs_idmap_new(struct nfs4_client *clp)
102 101
103 memset(idmap, 0, sizeof(*idmap)); 102 memset(idmap, 0, sizeof(*idmap));
104 103
105 snprintf(idmap->idmap_path, sizeof(idmap->idmap_path), 104 idmap->idmap_dentry = rpc_mkpipe(clp->cl_rpcclient->cl_dentry,
106 "%s/idmap", clp->cl_rpcclient->cl_pathname); 105 "idmap", idmap, &idmap_upcall_ops, 0);
107
108 idmap->idmap_dentry = rpc_mkpipe(idmap->idmap_path,
109 idmap, &idmap_upcall_ops, 0);
110 if (IS_ERR(idmap->idmap_dentry)) { 106 if (IS_ERR(idmap->idmap_dentry)) {
111 kfree(idmap); 107 kfree(idmap);
112 return; 108 return;
@@ -128,7 +124,7 @@ nfs_idmap_delete(struct nfs4_client *clp)
128 124
129 if (!idmap) 125 if (!idmap)
130 return; 126 return;
131 rpc_unlink(idmap->idmap_path); 127 rpc_unlink(idmap->idmap_dentry);
132 clp->cl_idmap = NULL; 128 clp->cl_idmap = NULL;
133 kfree(idmap); 129 kfree(idmap);
134} 130}