diff options
Diffstat (limited to 'net/sunrpc/svcauth_unix.c')
| -rw-r--r-- | net/sunrpc/svcauth_unix.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c index 2bd23ea2aa8b..07dcd20cbee4 100644 --- a/net/sunrpc/svcauth_unix.c +++ b/net/sunrpc/svcauth_unix.c | |||
| @@ -385,7 +385,7 @@ ip_map_cached_get(struct svc_rqst *rqstp) | |||
| 385 | { | 385 | { |
| 386 | struct ip_map *ipm; | 386 | struct ip_map *ipm; |
| 387 | struct svc_sock *svsk = rqstp->rq_sock; | 387 | struct svc_sock *svsk = rqstp->rq_sock; |
| 388 | spin_lock_bh(&svsk->sk_defer_lock); | 388 | spin_lock(&svsk->sk_lock); |
| 389 | ipm = svsk->sk_info_authunix; | 389 | ipm = svsk->sk_info_authunix; |
| 390 | if (ipm != NULL) { | 390 | if (ipm != NULL) { |
| 391 | if (!cache_valid(&ipm->h)) { | 391 | if (!cache_valid(&ipm->h)) { |
| @@ -395,13 +395,13 @@ ip_map_cached_get(struct svc_rqst *rqstp) | |||
| 395 | * same IP address. | 395 | * same IP address. |
| 396 | */ | 396 | */ |
| 397 | svsk->sk_info_authunix = NULL; | 397 | svsk->sk_info_authunix = NULL; |
| 398 | spin_unlock_bh(&svsk->sk_defer_lock); | 398 | spin_unlock(&svsk->sk_lock); |
| 399 | cache_put(&ipm->h, &ip_map_cache); | 399 | cache_put(&ipm->h, &ip_map_cache); |
| 400 | return NULL; | 400 | return NULL; |
| 401 | } | 401 | } |
| 402 | cache_get(&ipm->h); | 402 | cache_get(&ipm->h); |
| 403 | } | 403 | } |
| 404 | spin_unlock_bh(&svsk->sk_defer_lock); | 404 | spin_unlock(&svsk->sk_lock); |
| 405 | return ipm; | 405 | return ipm; |
| 406 | } | 406 | } |
| 407 | 407 | ||
| @@ -410,14 +410,14 @@ ip_map_cached_put(struct svc_rqst *rqstp, struct ip_map *ipm) | |||
| 410 | { | 410 | { |
| 411 | struct svc_sock *svsk = rqstp->rq_sock; | 411 | struct svc_sock *svsk = rqstp->rq_sock; |
| 412 | 412 | ||
| 413 | spin_lock_bh(&svsk->sk_defer_lock); | 413 | spin_lock(&svsk->sk_lock); |
| 414 | if (svsk->sk_sock->type == SOCK_STREAM && | 414 | if (svsk->sk_sock->type == SOCK_STREAM && |
| 415 | svsk->sk_info_authunix == NULL) { | 415 | svsk->sk_info_authunix == NULL) { |
| 416 | /* newly cached, keep the reference */ | 416 | /* newly cached, keep the reference */ |
| 417 | svsk->sk_info_authunix = ipm; | 417 | svsk->sk_info_authunix = ipm; |
| 418 | ipm = NULL; | 418 | ipm = NULL; |
| 419 | } | 419 | } |
| 420 | spin_unlock_bh(&svsk->sk_defer_lock); | 420 | spin_unlock(&svsk->sk_lock); |
| 421 | if (ipm) | 421 | if (ipm) |
| 422 | cache_put(&ipm->h, &ip_map_cache); | 422 | cache_put(&ipm->h, &ip_map_cache); |
| 423 | } | 423 | } |
