On 02/23/2017 07:33 PM, Trond Myklebust wrote:
> Instead of letting the kernel decide, default to enabling all versions,
> and let the user be more specifc in /etc/nfs.conf or on the command line.
>
> Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
This one was NACKed by Bruce...
steved.
> ---
> utils/nfsd/nfsd.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
> index 1708521ab286..9735e65466fa 100644
> --- a/utils/nfsd/nfsd.c
> +++ b/utils/nfsd/nfsd.c
> @@ -107,13 +107,12 @@ main(int argc, char **argv)
> }
>
> nfssvc_get_minormask(&minormask);
> - /* We assume the kernel will default all minor versions to 'on',
> - * and allow the config file to disable some.
> + /* We default all minor versions to 'on', and allow the config
> + * file to disable some.
> */
> - if (NFSCTL_VERISSET(versbits, 4)) {
> - NFSCTL_MINORSET(minorversset, 0);
> - NFSCTL_MINORSET(minorvers, 0);
> - }
> + if (NFSCTL_VERISSET(versbits, 4))
> + minorversset = minorvers = minormask;
> +
> for (i = 1; i <= NFS4_MAXMINOR; i++) {
> char tag[20];
> sprintf(tag, "vers4.%d", i);
>
--
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
