From owner-svn-src-projects@FreeBSD.ORG Mon Dec 3 01:05:37 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7372CFFC; Mon, 3 Dec 2012 01:05:37 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3F5068FC12; Mon, 3 Dec 2012 01:05:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB315baB002110; Mon, 3 Dec 2012 01:05:37 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB315b40002109; Mon, 3 Dec 2012 01:05:37 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201212030105.qB315b40002109@svn.freebsd.org> From: Rick Macklem Date: Mon, 3 Dec 2012 01:05:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r243806 - projects/nfsv4.1-client/sys/fs/nfsclient X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Dec 2012 01:05:37 -0000 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; }