diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-31 14:17:18 -0700 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-08-24 15:50:32 -0400 |
| commit | dff02cc1a34fcb60904a2c57cb351857cc11219e (patch) | |
| tree | e15957078e7f03f8b2b758cee0f7362d42f83c80 /net/sunrpc/clnt.c | |
| parent | 5d67476fff2df6ff12f60b540fd0e74cf2a668f9 (diff) | |
| download | blackbird-op-linux-dff02cc1a34fcb60904a2c57cb351857cc11219e.tar.gz blackbird-op-linux-dff02cc1a34fcb60904a2c57cb351857cc11219e.zip | |
NFS: clean up rpc_rmdir
Make it take a dentry argument instead of a path
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
(cherry picked from 648d4116eb2509f010f7f34704a650150309b3e7 commit)
Diffstat (limited to 'net/sunrpc/clnt.c')
| -rw-r--r-- | net/sunrpc/clnt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index d6409e757219..d307556872db 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -183,7 +183,7 @@ rpc_new_client(struct rpc_xprt *xprt, char *servname, out_no_auth: if (!IS_ERR(clnt->cl_dentry)) { - rpc_rmdir(clnt->cl_pathname); + rpc_rmdir(clnt->cl_dentry); dput(clnt->cl_dentry); rpc_put_mount(); } @@ -320,8 +320,8 @@ rpc_destroy_client(struct rpc_clnt *clnt) rpc_destroy_client(clnt->cl_parent); goto out_free; } - if (clnt->cl_pathname[0]) - rpc_rmdir(clnt->cl_pathname); + if (!IS_ERR(clnt->cl_dentry)) + rpc_rmdir(clnt->cl_dentry); if (clnt->cl_xprt) { xprt_destroy(clnt->cl_xprt); clnt->cl_xprt = NULL; |
