summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4state.c
diff options
context:
space:
mode:
authorJ. Bruce Fields2012-05-26 03:24:40 +0200
committerJ. Bruce Fields2012-06-01 02:30:21 +0200
commit0f1ba0ef213193aecf9baf8b4a3919cff4907e5d (patch)
tree378038d3254fdba35c798a7eb542fc2226c9b956 /fs/nfsd/nfs4state.c
parentnfsd4: clarify that renewing expired client is a bug (diff)
downloadkernel-qcow2-linux-0f1ba0ef213193aecf9baf8b4a3919cff4907e5d.tar.gz
kernel-qcow2-linux-0f1ba0ef213193aecf9baf8b4a3919cff4907e5d.tar.xz
kernel-qcow2-linux-0f1ba0ef213193aecf9baf8b4a3919cff4907e5d.zip
nfsd4: fix exchange_id to return confirm flag
Otherwise nfsd4_set_ex_flags writes over the return flags. Reported-by: Bryan Schumaker <bjschuma@netapp.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r--fs/nfsd/nfs4state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index e4d9b56a770a..83a68983aa26 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1617,7 +1617,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,
goto expire_client;
}
if (verfs_match) { /* case 2 */
- exid->flags |= EXCHGID4_FLAG_CONFIRMED_R;
+ conf->cl_exchange_flags |= EXCHGID4_FLAG_CONFIRMED_R;
new = conf;
goto out_copy;
}