aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/nfsd/nfs4state.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 8a06cb07896a..aca84c942595 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1545,13 +1545,11 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,
1545 status = nfs4_make_rec_clidname(dname, &exid->clname); 1545 status = nfs4_make_rec_clidname(dname, &exid->clname);
1546 1546
1547 if (status) 1547 if (status)
1548 goto error; 1548 return status;
1549 1549
1550 strhashval = clientstr_hashval(dname); 1550 strhashval = clientstr_hashval(dname);
1551 1551
1552 nfs4_lock_state(); 1552 nfs4_lock_state();
1553 status = nfs_ok;
1554
1555 conf = find_confirmed_client_by_str(dname, strhashval); 1553 conf = find_confirmed_client_by_str(dname, strhashval);
1556 if (conf) { 1554 if (conf) {
1557 if (!clp_used_exchangeid(conf)) { 1555 if (!clp_used_exchangeid(conf)) {
@@ -1630,8 +1628,6 @@ out_copy:
1630 1628
1631out: 1629out:
1632 nfs4_unlock_state(); 1630 nfs4_unlock_state();
1633error:
1634 dprintk("nfsd4_exchange_id returns %d\n", ntohl(status));
1635 return status; 1631 return status;
1636} 1632}
1637 1633