diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-29 13:59:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-29 13:59:05 +0100 |
| commit | b5f9a9d5113efe11a3b9dad600a6f833274da595 (patch) | |
| tree | 6db5fb34a2d590086e25f7f682fecb5f43e6b283 /fs/nfsd/nfs4proc.c | |
| parent | a1216394e620d0dfbb03c712ae3210e7b77c9e11 (diff) | |
| parent | 8d4d08ce8319ae26227c4dd558405963c14c2037 (diff) | |
| download | talos-op-linux-b5f9a9d5113efe11a3b9dad600a6f833274da595.tar.gz talos-op-linux-b5f9a9d5113efe11a3b9dad600a6f833274da595.zip | |
Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata
Conflicts:
drivers/spi/spi-rspi.c
Diffstat (limited to 'fs/nfsd/nfs4proc.c')
| -rw-r--r-- | fs/nfsd/nfs4proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index a7cee864e7b2..0d4c410e4589 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1293,7 +1293,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, * According to RFC3010, this takes precedence over all other errors. */ status = nfserr_minor_vers_mismatch; - if (args->minorversion > nfsd_supported_minorversion) + if (nfsd_minorversion(args->minorversion, NFSD_TEST) <= 0) goto out; status = nfs41_check_op_ordering(args); |
