From owner-svn-src-projects@freebsd.org Mon Sep 9 01:05:52 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 449FAE95A2 for ; Mon, 9 Sep 2019 01:05:52 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46RVN013ZHz4KSn; Mon, 9 Sep 2019 01:05:52 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 07A3F5CBC; Mon, 9 Sep 2019 01:05:52 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8915pq3094032; Mon, 9 Sep 2019 01:05:51 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8915p8x094030; Mon, 9 Sep 2019 01:05:51 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201909090105.x8915p8x094030@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 9 Sep 2019 01:05:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r352052 - in projects/nfsv42/sys: fs/nfsclient kern sys X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/nfsv42/sys: fs/nfsclient kern sys X-SVN-Commit-Revision: 352052 X-SVN-Commit-Repository: base 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.29 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, 09 Sep 2019 01:05:52 -0000 Author: rmacklem Date: Mon Sep 9 01:05:51 2019 New Revision: 352052 URL: https://svnweb.freebsd.org/changeset/base/352052 Log: Make vop_stdioctl() a global function so that nfs_ioctl() can call it. Modified: projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c projects/nfsv42/sys/kern/vfs_default.c projects/nfsv42/sys/sys/vnode.h Modified: projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c ============================================================================== --- projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c Mon Sep 9 00:46:22 2019 (r352051) +++ projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c Mon Sep 9 01:05:51 2019 (r352052) @@ -3706,11 +3706,7 @@ nfs_ioctl(struct vop_ioctl_args *ap) return (ENOTTY); nmp = VFSTONFS(vp->v_mount); if (!NFSHASNFSV4(nmp) || nmp->nm_minorvers < NFSV42_MINORVERSION) { -#ifdef notyet error = vop_stdioctl(ap); -#else - error = ENOTTY; -#endif return (error); } Modified: projects/nfsv42/sys/kern/vfs_default.c ============================================================================== --- projects/nfsv42/sys/kern/vfs_default.c Mon Sep 9 00:46:22 2019 (r352051) +++ projects/nfsv42/sys/kern/vfs_default.c Mon Sep 9 01:05:51 2019 (r352052) @@ -87,7 +87,6 @@ static int vop_stdadd_writecount(struct vop_add_writec static int vop_stdcopy_file_range(struct vop_copy_file_range_args *ap); static int vop_stdfdatasync(struct vop_fdatasync_args *ap); static int vop_stdgetpages_async(struct vop_getpages_async_args *ap); -static int vop_stdioctl(struct vop_ioctl_args *ap); /* * This vnode table stores what we want to do if the filesystem doesn't @@ -1173,7 +1172,7 @@ vop_stdneed_inactive(struct vop_need_inactive_args *ap return (1); } -static int +int vop_stdioctl(struct vop_ioctl_args *ap) { struct vnode *vp; Modified: projects/nfsv42/sys/sys/vnode.h ============================================================================== --- projects/nfsv42/sys/sys/vnode.h Mon Sep 9 00:46:22 2019 (r352051) +++ projects/nfsv42/sys/sys/vnode.h Mon Sep 9 01:05:51 2019 (r352052) @@ -757,6 +757,7 @@ int vop_stdfsync(struct vop_fsync_args *); int vop_stdgetwritemount(struct vop_getwritemount_args *); int vop_stdgetpages(struct vop_getpages_args *); int vop_stdinactive(struct vop_inactive_args *); +int vop_stdioctl(struct vop_ioctl_args *); int vop_stdneed_inactive(struct vop_need_inactive_args *); int vop_stdislocked(struct vop_islocked_args *); int vop_stdkqfilter(struct vop_kqfilter_args *);