This patch series was intended as a standalone series. However it now aims to fix up a few issues with Neil's initial patch: 1) When the user turns off all minor versions of NFSv4, then that should be equivalent to turning off NFSv4 support, and so when someone tries to mount, we should return RPC_PROG_MISMATCH. 2) Allow the user to use either '4.0' or '4' in order to enable or disable minor version 0. Other minor versions remain enabled/disabled using the '4.x' format. 3) Fix up the display of the minor versions so that we don't add '4.0'. Previous kernels have always assumed the '4' means 'minor version 0', so there should be no need to have both. v2: Make incremental to Neil's patch Fix up display of the version string Trond Myklebust (2): nfsd: Allow enabling NFSv4.x without also requiring NFSv4.0 nfsd: Fix display of the version string fs/nfsd/nfsctl.c | 72 ++++++++++++++++++++++++++------------------------------ fs/nfsd/nfssvc.c | 14 +++++++++++ 2 files changed, 48 insertions(+), 38 deletions(-) -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html