diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-06-23 10:46:47 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-07-10 23:40:34 -0400 |
commit | de7a8ce38aea529876db3890b61947bc4bc004da (patch) | |
tree | 2067bae81ea0d39631d4caae9a8a092380f1932c | |
parent | 5e1550d6a2c2dd33ff0ca5febefd8e9c65c6ca1e (diff) |
SUNRPC: Rename rpcauth_destroy() to rpcauth_release()
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r-- | include/linux/sunrpc/auth.h | 2 | ||||
-rw-r--r-- | net/sunrpc/auth.c | 4 | ||||
-rw-r--r-- | net/sunrpc/clnt.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h index 3972b8414c88..bc77c730325c 100644 --- a/include/linux/sunrpc/auth.h +++ b/include/linux/sunrpc/auth.h | |||
@@ -128,7 +128,7 @@ extern struct rpc_authops authdes_ops; | |||
128 | int rpcauth_register(struct rpc_authops *); | 128 | int rpcauth_register(struct rpc_authops *); |
129 | int rpcauth_unregister(struct rpc_authops *); | 129 | int rpcauth_unregister(struct rpc_authops *); |
130 | struct rpc_auth * rpcauth_create(rpc_authflavor_t, struct rpc_clnt *); | 130 | struct rpc_auth * rpcauth_create(rpc_authflavor_t, struct rpc_clnt *); |
131 | void rpcauth_destroy(struct rpc_auth *); | 131 | void rpcauth_release(struct rpc_auth *); |
132 | struct rpc_cred * rpcauth_lookup_credcache(struct rpc_auth *, struct auth_cred *, int); | 132 | struct rpc_cred * rpcauth_lookup_credcache(struct rpc_auth *, struct auth_cred *, int); |
133 | struct rpc_cred * rpcauth_lookupcred(struct rpc_auth *, int); | 133 | struct rpc_cred * rpcauth_lookupcred(struct rpc_auth *, int); |
134 | struct rpc_cred * rpcauth_bindcred(struct rpc_task *); | 134 | struct rpc_cred * rpcauth_bindcred(struct rpc_task *); |
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index 584f24311a80..1686dc74c6a9 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c | |||
@@ -93,7 +93,7 @@ rpcauth_create(rpc_authflavor_t pseudoflavor, struct rpc_clnt *clnt) | |||
93 | if (IS_ERR(auth)) | 93 | if (IS_ERR(auth)) |
94 | return auth; | 94 | return auth; |
95 | if (clnt->cl_auth) | 95 | if (clnt->cl_auth) |
96 | rpcauth_destroy(clnt->cl_auth); | 96 | rpcauth_release(clnt->cl_auth); |
97 | clnt->cl_auth = auth; | 97 | clnt->cl_auth = auth; |
98 | 98 | ||
99 | out: | 99 | out: |
@@ -101,7 +101,7 @@ out: | |||
101 | } | 101 | } |
102 | 102 | ||
103 | void | 103 | void |
104 | rpcauth_destroy(struct rpc_auth *auth) | 104 | rpcauth_release(struct rpc_auth *auth) |
105 | { | 105 | { |
106 | if (!atomic_dec_and_test(&auth->au_count)) | 106 | if (!atomic_dec_and_test(&auth->au_count)) |
107 | return; | 107 | return; |
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 5a28ffac99ea..98df44e453fe 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c | |||
@@ -353,7 +353,7 @@ rpc_free_client(struct kref *kref) | |||
353 | dprintk("RPC: destroying %s client for %s\n", | 353 | dprintk("RPC: destroying %s client for %s\n", |
354 | clnt->cl_protname, clnt->cl_server); | 354 | clnt->cl_protname, clnt->cl_server); |
355 | if (clnt->cl_auth) { | 355 | if (clnt->cl_auth) { |
356 | rpcauth_destroy(clnt->cl_auth); | 356 | rpcauth_release(clnt->cl_auth); |
357 | clnt->cl_auth = NULL; | 357 | clnt->cl_auth = NULL; |
358 | } | 358 | } |
359 | if (!IS_ERR(clnt->cl_dentry)) { | 359 | if (!IS_ERR(clnt->cl_dentry)) { |