From owner-svn-src-all@freebsd.org Wed Oct 24 19:28:09 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB3A0103774B; Wed, 24 Oct 2018 19:28:09 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 16CEE7647E; Wed, 24 Oct 2018 19:28:08 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id FOoxgrquSWppDFOoygshJO; Wed, 24 Oct 2018 13:28:01 -0600 X-Authority-Analysis: v=2.3 cv=YIcrNiOx c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=kj9zAlcOel0A:10 a=smKx5t2vBNcA:10 a=VxmjJ2MpAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=sGet12G_jDSfRzJ0xdQA:9 a=CjuIK1q_8ugA:10 a=RdyI0T4chQwA:10 a=7gXAzLPJhVmCkEl4_tsf:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy8 [10.2.2.6]) by spqr.komquats.com (Postfix) with ESMTPS id 6CE86AC0; Wed, 24 Oct 2018 12:27:56 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id w9OJRrHb004490; Wed, 24 Oct 2018 12:27:53 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id w9OJRq8H004487; Wed, 24 Oct 2018 12:27:53 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201810241927.w9OJRq8H004487@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Konstantin Belousov cc: Cy Schubert , Konstantin Belousov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r339672 - in head/sys: fs/nfsclient kern sys tools In-Reply-To: Message from Konstantin Belousov of "Wed, 24 Oct 2018 17:56:49 +0300." <20181024145649.GC5335@kib.kiev.ua> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 24 Oct 2018 12:27:52 -0700 X-CMAE-Envelope: MS4wfAf2b35ngr1f4W8yU50gmMz/7RkW+lcp0dVaNQiUiLwf1zyzuWs7ix9oS2sCujqWJR7LdewhF63j6yyBYtlETJkDCba4gWBiRZnnmIYSota8DrCjttqO OFSolSZgkGcNHVZRy4LxVYbyVPwTCycaQy0D6e9r4v5y5O1c+lBvYLcPPpDsQmuPq3FT1hcHNDrd6UCc0b8JI93vMsaIJjTrBzm54CG6JFWTVI3g7KkAyTDF ExAYK8qbrMV44Zr/qPf5I7yuKCDZnXG+amHuADzNddYcX0cKGH6dbxmCUHu711DWAZLvUfjDCJck4/81oPgmVg== X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Oct 2018 19:28:10 -0000 In message <20181024145649.GC5335@kib.kiev.ua>, Konstantin Belousov writes: > On Wed, Oct 24, 2018 at 07:19:33AM -0700, Cy Schubert wrote: > > In message <201810241159.w9OBxFWg013534@slippy.cwsent.com>, Cy Schubert > > writes: > > > In message <201810232143.w9NLhfeK087221@repo.freebsd.org>, Konstantin > > > Belousov > > > writes: > > > > Author: kib > > > > Date: Tue Oct 23 21:43:41 2018 > > > > New Revision: 339672 > > > > URL: https://svnweb.freebsd.org/changeset/base/339672 > > > > > > > > Log: > > > > Only call sigdeferstop() for NFS. > > > > > > > > Use bypass to catch any NFS VOP dispatch and route it through the > > > > wrapper which does sigdeferstop() and then dispatches original > > > > VOP. NFS does not need a bypass below it, which is not supported. > > > > > > > > The vop offset in the vop_vector is added since otherwise it is > > > > impossible to get vop_op_t from the internal table, and I did not > > > > wanted to create the layered fs only to wrap NFS VOPs. > > > > > > > > VFS_OP()s wrap is straightforward. > > > > > > > > Requested and reviewed by: mjg (previous version) > > > > Tested by: pho > > > > Sponsored by: The FreeBSD Foundation > > > > Differential revision: https://reviews.freebsd.org/D17658 > > > > > > > > Modified: > > > > head/sys/fs/nfsclient/nfs_clvnops.c > > > > head/sys/kern/vfs_default.c > > > > head/sys/kern/vfs_init.c > > > > head/sys/kern/vfs_mount.c > > > > head/sys/sys/mount.h > > > > head/sys/sys/vnode.h > > > > head/sys/tools/vnode_if.awk > > > > > > > > > > Unfortunately this broke amd(8). > > > > I should have included this. > > > > Oct 24 00:34:13 slippy amd[2741]: '/home': mount: Operation not > > supported > > Oct 24 00:34:13 slippy amd[2742]: '/vol': mount: Operation not supported > > Oct 24 00:34:13 slippy amd[2743]: '/net': mount: Operation not supported > > Oct 24 00:34:14 slippy amd[2742]: '/vol': mount: Operation not supported > > Oct 24 00:34:14 slippy amd[2741]: '/home': mount: Operation not > > supported > > Oct 24 00:34:14 slippy amd[2742]: amfs_toplvl_mount: amfs_mount failed: > > Operation not supported > > Try this. > > diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c > index 8d98cb199ec..74bfe733100 100644 > --- a/sys/kern/vfs_mount.c > +++ b/sys/kern/vfs_mount.c > @@ -808,8 +808,10 @@ sys_mount(struct thread *td, struct mount_args *uap) > free(fstype, M_TEMP); > if (vfsp == NULL) > return (ENOENT); > - if (vfsp->vfc_vfsops->vfs_cmount == NULL || ((vfsp->vfc_flags & > - VFCF_SBDRY) != 0 && (vfsp->vfc_vfsops_sd->vfs_cmount == NULL))) > + if (((vfsp->vfc_flags & VFCF_SBDRY) != 0 && > + vfsp->vfc_vfsops_sd->vfs_cmount == NULL) || > + ((vfsp->vfc_flags & VFCF_SBDRY) == 0 && > + vfsp->vfc_vfsops->vfs_cmount == NULL)) > return (EOPNOTSUPP); > > ma = mount_argsu(ma, "fstype", uap->type, MFSNAMELEN); Yes, that fixes it. Thank you. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.