aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-08-24 01:03:17 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-09-22 23:24:54 -0400
commit158998b6fe36f6acef087f574c96d44713499cc9 (patch)
treeafc0f330e51135cdcf05bd8c268bf514165a4e4a /fs
parent5dd3177ae5012c1e2ad7a9ffdbd0e0d0de2f60e4 (diff)
SUNRPC: Make rpc_mkpipe() take the parent dentry as an argument
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/idmap.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index f96dfac7dc9a..82ad7110a1c0 100644
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -84,7 +84,6 @@ struct idmap_hashtable {
84}; 84};
85 85
86struct idmap { 86struct idmap {
87 char idmap_path[48];
88 struct dentry *idmap_dentry; 87 struct dentry *idmap_dentry;
89 wait_queue_head_t idmap_wq; 88 wait_queue_head_t idmap_wq;
90 struct idmap_msg idmap_im; 89 struct idmap_msg idmap_im;
@@ -119,10 +118,7 @@ nfs_idmap_new(struct nfs_client *clp)
119 if ((idmap = kzalloc(sizeof(*idmap), GFP_KERNEL)) == NULL) 118 if ((idmap = kzalloc(sizeof(*idmap), GFP_KERNEL)) == NULL)
120 return -ENOMEM; 119 return -ENOMEM;
121 120
122 snprintf(idmap->idmap_path, sizeof(idmap->idmap_path), 121 idmap->idmap_dentry = rpc_mkpipe(clp->cl_rpcclient->cl_dentry, "idmap",
123 "%s/idmap", clp->cl_rpcclient->cl_pathname);
124
125 idmap->idmap_dentry = rpc_mkpipe(idmap->idmap_path,
126 idmap, &idmap_upcall_ops, 0); 122 idmap, &idmap_upcall_ops, 0);
127 if (IS_ERR(idmap->idmap_dentry)) { 123 if (IS_ERR(idmap->idmap_dentry)) {
128 error = PTR_ERR(idmap->idmap_dentry); 124 error = PTR_ERR(idmap->idmap_dentry);