diff options
| -rw-r--r-- | fs/nfsd/nfs4state.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 56999cbe84a7..43e66fc1b90d 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
| @@ -2496,8 +2496,10 @@ nfsd4_create_session(struct svc_rqst *rqstp, | |||
| 2496 | old = find_confirmed_client_by_name(&unconf->cl_name, nn); | 2496 | old = find_confirmed_client_by_name(&unconf->cl_name, nn); |
| 2497 | if (old) { | 2497 | if (old) { |
| 2498 | status = mark_client_expired_locked(old); | 2498 | status = mark_client_expired_locked(old); |
| 2499 | if (status) | 2499 | if (status) { |
| 2500 | old = NULL; | ||
| 2500 | goto out_free_conn; | 2501 | goto out_free_conn; |
| 2502 | } | ||
| 2501 | } | 2503 | } |
| 2502 | move_to_confirmed(unconf); | 2504 | move_to_confirmed(unconf); |
| 2503 | conf = unconf; | 2505 | conf = unconf; |
| @@ -3041,8 +3043,10 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, | |||
| 3041 | old = find_confirmed_client_by_name(&unconf->cl_name, nn); | 3043 | old = find_confirmed_client_by_name(&unconf->cl_name, nn); |
| 3042 | if (old) { | 3044 | if (old) { |
| 3043 | status = mark_client_expired_locked(old); | 3045 | status = mark_client_expired_locked(old); |
| 3044 | if (status) | 3046 | if (status) { |
| 3047 | old = NULL; | ||
| 3045 | goto out; | 3048 | goto out; |
| 3049 | } | ||
| 3046 | } | 3050 | } |
| 3047 | move_to_confirmed(unconf); | 3051 | move_to_confirmed(unconf); |
| 3048 | conf = unconf; | 3052 | conf = unconf; |