Date: Mon, 3 Dec 2012 01:05:37 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r243806 - projects/nfsv4.1-client/sys/fs/nfsclient Message-ID: <201212030105.qB315b40002109@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Mon Dec 3 01:05:36 2012 New Revision: 243806 URL: http://svnweb.freebsd.org/changeset/base/243806 Log: Change the NFSv4.1 minor version option from "minvers" to "minorversion", since that is what Linux uses. Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clvfsops.c Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clvfsops.c ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clvfsops.c Mon Dec 3 01:02:45 2012 (r243805) +++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clvfsops.c Mon Dec 3 01:05:36 2012 (r243806) @@ -719,7 +719,7 @@ static const char *nfs_opts[] = { "from" "readdirsize", "soft", "hard", "mntudp", "tcp", "udp", "wsize", "rsize", "retrans", "acregmin", "acregmax", "acdirmin", "acdirmax", "resvport", "readahead", "hostname", "timeout", "addr", "fh", "nfsv3", "sec", - "principal", "nfsv4", "gssname", "allgssname", "dirpath", "minvers", + "principal", "nfsv4", "gssname", "allgssname", "dirpath", "minorversion", "nametimeo", "negnametimeo", "nocto", "pnfs", "wcommitsize", NULL }; @@ -995,11 +995,12 @@ nfs_mount(struct mount *mp) goto out; } } - if (vfs_getopt(mp->mnt_optnew, "minvers", (void **)&opt, NULL) == 0) { + if (vfs_getopt(mp->mnt_optnew, "minorversion", (void **)&opt, NULL) == + 0) { ret = sscanf(opt, "%d", &minvers); if (ret != 1 || minvers < 0 || minvers > 1 || (args.flags & NFSMNT_NFSV4) == 0) { - vfs_mount_error(mp, "illegal minvers: %s", opt); + vfs_mount_error(mp, "illegal minorversion: %s", opt); error = EINVAL; goto out; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212030105.qB315b40002109>