diff options
Diffstat (limited to 'net/sunrpc/auth.c')
-rw-r--r-- | net/sunrpc/auth.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index 993ff1a5d94..5752f294751 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c | |||
@@ -181,7 +181,7 @@ rpcauth_gc_credcache(struct rpc_auth *auth, struct hlist_head *free) | |||
181 | struct rpc_cred *cred; | 181 | struct rpc_cred *cred; |
182 | int i; | 182 | int i; |
183 | 183 | ||
184 | dprintk("RPC: gc'ing RPC credentials for auth %p\n", auth); | 184 | dprintk("RPC: gc'ing RPC credentials for auth %p\n", auth); |
185 | for (i = 0; i < RPC_CREDCACHE_NR; i++) { | 185 | for (i = 0; i < RPC_CREDCACHE_NR; i++) { |
186 | hlist_for_each_safe(pos, next, &cache->hashtable[i]) { | 186 | hlist_for_each_safe(pos, next, &cache->hashtable[i]) { |
187 | cred = hlist_entry(pos, struct rpc_cred, cr_hash); | 187 | cred = hlist_entry(pos, struct rpc_cred, cr_hash); |
@@ -267,7 +267,7 @@ rpcauth_lookupcred(struct rpc_auth *auth, int flags) | |||
267 | }; | 267 | }; |
268 | struct rpc_cred *ret; | 268 | struct rpc_cred *ret; |
269 | 269 | ||
270 | dprintk("RPC: looking up %s cred\n", | 270 | dprintk("RPC: looking up %s cred\n", |
271 | auth->au_ops->au_name); | 271 | auth->au_ops->au_name); |
272 | get_group_info(acred.group_info); | 272 | get_group_info(acred.group_info); |
273 | ret = auth->au_ops->lookup_cred(auth, &acred, flags); | 273 | ret = auth->au_ops->lookup_cred(auth, &acred, flags); |
@@ -287,7 +287,7 @@ rpcauth_bindcred(struct rpc_task *task) | |||
287 | struct rpc_cred *ret; | 287 | struct rpc_cred *ret; |
288 | int flags = 0; | 288 | int flags = 0; |
289 | 289 | ||
290 | dprintk("RPC: %4d looking up %s cred\n", | 290 | dprintk("RPC: %5u looking up %s cred\n", |
291 | task->tk_pid, task->tk_auth->au_ops->au_name); | 291 | task->tk_pid, task->tk_auth->au_ops->au_name); |
292 | get_group_info(acred.group_info); | 292 | get_group_info(acred.group_info); |
293 | if (task->tk_flags & RPC_TASK_ROOTCREDS) | 293 | if (task->tk_flags & RPC_TASK_ROOTCREDS) |
@@ -304,8 +304,9 @@ rpcauth_bindcred(struct rpc_task *task) | |||
304 | void | 304 | void |
305 | rpcauth_holdcred(struct rpc_task *task) | 305 | rpcauth_holdcred(struct rpc_task *task) |
306 | { | 306 | { |
307 | dprintk("RPC: %4d holding %s cred %p\n", | 307 | dprintk("RPC: %5u holding %s cred %p\n", |
308 | task->tk_pid, task->tk_auth->au_ops->au_name, task->tk_msg.rpc_cred); | 308 | task->tk_pid, task->tk_auth->au_ops->au_name, |
309 | task->tk_msg.rpc_cred); | ||
309 | if (task->tk_msg.rpc_cred) | 310 | if (task->tk_msg.rpc_cred) |
310 | get_rpccred(task->tk_msg.rpc_cred); | 311 | get_rpccred(task->tk_msg.rpc_cred); |
311 | } | 312 | } |
@@ -324,7 +325,7 @@ rpcauth_unbindcred(struct rpc_task *task) | |||
324 | { | 325 | { |
325 | struct rpc_cred *cred = task->tk_msg.rpc_cred; | 326 | struct rpc_cred *cred = task->tk_msg.rpc_cred; |
326 | 327 | ||
327 | dprintk("RPC: %4d releasing %s cred %p\n", | 328 | dprintk("RPC: %5u releasing %s cred %p\n", |
328 | task->tk_pid, task->tk_auth->au_ops->au_name, cred); | 329 | task->tk_pid, task->tk_auth->au_ops->au_name, cred); |
329 | 330 | ||
330 | put_rpccred(cred); | 331 | put_rpccred(cred); |
@@ -336,7 +337,7 @@ rpcauth_marshcred(struct rpc_task *task, __be32 *p) | |||
336 | { | 337 | { |
337 | struct rpc_cred *cred = task->tk_msg.rpc_cred; | 338 | struct rpc_cred *cred = task->tk_msg.rpc_cred; |
338 | 339 | ||
339 | dprintk("RPC: %4d marshaling %s cred %p\n", | 340 | dprintk("RPC: %5u marshaling %s cred %p\n", |
340 | task->tk_pid, task->tk_auth->au_ops->au_name, cred); | 341 | task->tk_pid, task->tk_auth->au_ops->au_name, cred); |
341 | 342 | ||
342 | return cred->cr_ops->crmarshal(task, p); | 343 | return cred->cr_ops->crmarshal(task, p); |
@@ -347,7 +348,7 @@ rpcauth_checkverf(struct rpc_task *task, __be32 *p) | |||
347 | { | 348 | { |
348 | struct rpc_cred *cred = task->tk_msg.rpc_cred; | 349 | struct rpc_cred *cred = task->tk_msg.rpc_cred; |
349 | 350 | ||
350 | dprintk("RPC: %4d validating %s cred %p\n", | 351 | dprintk("RPC: %5u validating %s cred %p\n", |
351 | task->tk_pid, task->tk_auth->au_ops->au_name, cred); | 352 | task->tk_pid, task->tk_auth->au_ops->au_name, cred); |
352 | 353 | ||
353 | return cred->cr_ops->crvalidate(task, p); | 354 | return cred->cr_ops->crvalidate(task, p); |
@@ -359,7 +360,7 @@ rpcauth_wrap_req(struct rpc_task *task, kxdrproc_t encode, void *rqstp, | |||
359 | { | 360 | { |
360 | struct rpc_cred *cred = task->tk_msg.rpc_cred; | 361 | struct rpc_cred *cred = task->tk_msg.rpc_cred; |
361 | 362 | ||
362 | dprintk("RPC: %4d using %s cred %p to wrap rpc data\n", | 363 | dprintk("RPC: %5u using %s cred %p to wrap rpc data\n", |
363 | task->tk_pid, cred->cr_ops->cr_name, cred); | 364 | task->tk_pid, cred->cr_ops->cr_name, cred); |
364 | if (cred->cr_ops->crwrap_req) | 365 | if (cred->cr_ops->crwrap_req) |
365 | return cred->cr_ops->crwrap_req(task, encode, rqstp, data, obj); | 366 | return cred->cr_ops->crwrap_req(task, encode, rqstp, data, obj); |
@@ -373,7 +374,7 @@ rpcauth_unwrap_resp(struct rpc_task *task, kxdrproc_t decode, void *rqstp, | |||
373 | { | 374 | { |
374 | struct rpc_cred *cred = task->tk_msg.rpc_cred; | 375 | struct rpc_cred *cred = task->tk_msg.rpc_cred; |
375 | 376 | ||
376 | dprintk("RPC: %4d using %s cred %p to unwrap rpc data\n", | 377 | dprintk("RPC: %5u using %s cred %p to unwrap rpc data\n", |
377 | task->tk_pid, cred->cr_ops->cr_name, cred); | 378 | task->tk_pid, cred->cr_ops->cr_name, cred); |
378 | if (cred->cr_ops->crunwrap_resp) | 379 | if (cred->cr_ops->crunwrap_resp) |
379 | return cred->cr_ops->crunwrap_resp(task, decode, rqstp, | 380 | return cred->cr_ops->crunwrap_resp(task, decode, rqstp, |
@@ -388,7 +389,7 @@ rpcauth_refreshcred(struct rpc_task *task) | |||
388 | struct rpc_cred *cred = task->tk_msg.rpc_cred; | 389 | struct rpc_cred *cred = task->tk_msg.rpc_cred; |
389 | int err; | 390 | int err; |
390 | 391 | ||
391 | dprintk("RPC: %4d refreshing %s cred %p\n", | 392 | dprintk("RPC: %5u refreshing %s cred %p\n", |
392 | task->tk_pid, task->tk_auth->au_ops->au_name, cred); | 393 | task->tk_pid, task->tk_auth->au_ops->au_name, cred); |
393 | 394 | ||
394 | err = cred->cr_ops->crrefresh(task); | 395 | err = cred->cr_ops->crrefresh(task); |
@@ -400,7 +401,7 @@ rpcauth_refreshcred(struct rpc_task *task) | |||
400 | void | 401 | void |
401 | rpcauth_invalcred(struct rpc_task *task) | 402 | rpcauth_invalcred(struct rpc_task *task) |
402 | { | 403 | { |
403 | dprintk("RPC: %4d invalidating %s cred %p\n", | 404 | dprintk("RPC: %5u invalidating %s cred %p\n", |
404 | task->tk_pid, task->tk_auth->au_ops->au_name, task->tk_msg.rpc_cred); | 405 | task->tk_pid, task->tk_auth->au_ops->au_name, task->tk_msg.rpc_cred); |
405 | spin_lock(&rpc_credcache_lock); | 406 | spin_lock(&rpc_credcache_lock); |
406 | if (task->tk_msg.rpc_cred) | 407 | if (task->tk_msg.rpc_cred) |