summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2013-05-07 11:57:52 -0400
committerJ. Bruce Fields <bfields@redhat.com>2013-05-13 10:11:45 -0400
commit4f540e29dc20b87d460559bce184d2238237f48b (patch)
tree813343718bf8df56efbef3f30313f55ccfad3e7b /fs
parenteb48241bb4484e56171fcb5beb39f530a2cd484e (diff)
downloadop-kernel-dev-4f540e29dc20b87d460559bce184d2238237f48b.zip
op-kernel-dev-4f540e29dc20b87d460559bce184d2238237f48b.tar.gz
nfsd4: store correct client minorversion for >=4.2
This code assumes that any client using exchange_id is using NFSv4.1, but with the introduction of 4.2 that will no longer true. This main effect of this is that client callbacks will use the same minorversion as that used on the exchange_id. Note that clients are forbidden from mixing 4.1 and 4.2 compounds. (See rfc 5661, section 2.7, #13: "A client MUST NOT attempt to use a stateid, filehandle, or similar returned object from the COMPOUND procedure with minor version X for another COMPOUND procedure with minor version Y, where X != Y.") However, we do not currently attempt to enforce this except in the case of mixing zero minor version with non-zero minor versions. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs')
-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 316ec843..91ead0e 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1709,7 +1709,7 @@ out_new:
status = nfserr_jukebox;
goto out;
}
- new->cl_minorversion = 1;
+ new->cl_minorversion = cstate->minorversion;
gen_clid(new, nn);
add_to_unconfirmed(new);
OpenPOWER on IntegriCloud