From: J. Bruce Fields <bfields@redhat.com>
Date: Sat, 26 May 2012 01:24:40 +0000 (-0400)
Subject: nfsd4: fix exchange_id to return confirm flag
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0f1ba0ef213193aecf9baf8b4a3919cff4907e5d;p=deliverable%2Flinux.git

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>
---

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;
 		}