diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-09-23 11:08:25 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-09-23 12:39:00 -0400 |
| commit | f134585a7343d71f9be7f0cf97e2145f21dd10c6 (patch) | |
| tree | f1eae77a5063e3748cd8deba9a13794ae0a9439c /fs/nfs | |
| parent | 3063d8a16643190f9e12e9c7e9f1ca56f7e7934e (diff) | |
| download | kernel_goldelico_gta04-f134585a7343d71f9be7f0cf97e2145f21dd10c6.zip kernel_goldelico_gta04-f134585a7343d71f9be7f0cf97e2145f21dd10c6.tar.gz kernel_goldelico_gta04-f134585a7343d71f9be7f0cf97e2145f21dd10c6.tar.bz2 | |
Revert "[PATCH] RPC,NFS: new rpc_pipefs patch"
This reverts 17f4e6febca160a9f9dd4bdece9784577a2f4524 commit.
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/idmap.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c index 1d0a5bf..ffb8df9 100644 --- a/fs/nfs/idmap.c +++ b/fs/nfs/idmap.c @@ -66,6 +66,7 @@ struct idmap_hashtable { }; struct idmap { + char idmap_path[48]; struct dentry *idmap_dentry; wait_queue_head_t idmap_wq; struct idmap_msg idmap_im; @@ -101,8 +102,11 @@ nfs_idmap_new(struct nfs4_client *clp) memset(idmap, 0, sizeof(*idmap)); - idmap->idmap_dentry = rpc_mkpipe(clp->cl_rpcclient->cl_dentry, - "idmap", idmap, &idmap_upcall_ops, 0); + snprintf(idmap->idmap_path, sizeof(idmap->idmap_path), + "%s/idmap", clp->cl_rpcclient->cl_pathname); + + idmap->idmap_dentry = rpc_mkpipe(idmap->idmap_path, + idmap, &idmap_upcall_ops, 0); if (IS_ERR(idmap->idmap_dentry)) { kfree(idmap); return; @@ -124,7 +128,7 @@ nfs_idmap_delete(struct nfs4_client *clp) if (!idmap) return; - rpc_unlink(idmap->idmap_dentry); + rpc_unlink(idmap->idmap_path); clp->cl_idmap = NULL; kfree(idmap); } |