summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2012-05-13 02:53:20 +0200
committerJ. Bruce Fields <bfields@redhat.com>2012-06-01 02:29:50 +0200
commit2786cc3a056e642809a348d9b1e6a857b9d23d25 (patch)
treedabf5d6de0fd0d87260c8842b338c3e561b11ab7 /fs/nfsd
parentnfsd4: exchange_id has a pointless copy (diff)
downloadlinux-2786cc3a056e642809a348d9b1e6a857b9d23d25.tar.xz
linux-2786cc3a056e642809a348d9b1e6a857b9d23d25.zip
nfsd4: exchange_id error cleanup
There's no point to the dprintk here as the main proc_compound loop already does this. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-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,
status = nfs4_make_rec_clidname(dname, &exid->clname);
if (status)
- goto error;
+ return status;
strhashval = clientstr_hashval(dname);
nfs4_lock_state();
- status = nfs_ok;
-
conf = find_confirmed_client_by_str(dname, strhashval);
if (conf) {
if (!clp_used_exchangeid(conf)) {
@@ -1630,8 +1628,6 @@ out_copy:
out:
nfs4_unlock_state();
-error:
- dprintk("nfsd4_exchange_id returns %d\n", ntohl(status));
return status;
}