diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-08-10 17:45:58 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-08-10 17:45:58 -0400 |
| commit | f884dcaead5f17bf586ac5fe6a3ad07b5203616a (patch) | |
| tree | 2406444df167f1d67b38733b544f2e2a96c778c7 /fs/nfs | |
| parent | 976a6f921cad26651d25e73826c05c7a023f5fa4 (diff) | |
| parent | 8854e82d9accc80f43c0bc3ff06b5979ac858185 (diff) | |
Merge branch 'sunrpc_cache-for-2.6.32' into nfs-for-2.6.32
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/idmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c index 86147b0ab2cf..21a84d45916f 100644 --- a/fs/nfs/idmap.c +++ b/fs/nfs/idmap.c | |||
| @@ -101,7 +101,7 @@ static void idmap_pipe_destroy_msg(struct rpc_pipe_msg *); | |||
| 101 | 101 | ||
| 102 | static unsigned int fnvhash32(const void *, size_t); | 102 | static unsigned int fnvhash32(const void *, size_t); |
| 103 | 103 | ||
| 104 | static struct rpc_pipe_ops idmap_upcall_ops = { | 104 | static const struct rpc_pipe_ops idmap_upcall_ops = { |
| 105 | .upcall = idmap_pipe_upcall, | 105 | .upcall = idmap_pipe_upcall, |
| 106 | .downcall = idmap_pipe_downcall, | 106 | .downcall = idmap_pipe_downcall, |
| 107 | .destroy_msg = idmap_pipe_destroy_msg, | 107 | .destroy_msg = idmap_pipe_destroy_msg, |
| @@ -119,8 +119,8 @@ nfs_idmap_new(struct nfs_client *clp) | |||
| 119 | if (idmap == NULL) | 119 | if (idmap == NULL) |
| 120 | return -ENOMEM; | 120 | return -ENOMEM; |
| 121 | 121 | ||
| 122 | idmap->idmap_dentry = rpc_mkpipe(clp->cl_rpcclient->cl_dentry, "idmap", | 122 | idmap->idmap_dentry = rpc_mkpipe(clp->cl_rpcclient->cl_path.dentry, |
| 123 | idmap, &idmap_upcall_ops, 0); | 123 | "idmap", idmap, &idmap_upcall_ops, 0); |
| 124 | if (IS_ERR(idmap->idmap_dentry)) { | 124 | if (IS_ERR(idmap->idmap_dentry)) { |
| 125 | error = PTR_ERR(idmap->idmap_dentry); | 125 | error = PTR_ERR(idmap->idmap_dentry); |
| 126 | kfree(idmap); | 126 | kfree(idmap); |