From nobody Thu Jan 27 02:00:27 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 674DD1969315; Thu, 27 Jan 2022 02:00:42 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4JkkMF1rptz3nvC; Thu, 27 Jan 2022 02:00:41 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.16.1/8.16.1) with ESMTPS id 20R20RnA093534 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 27 Jan 2022 04:00:30 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by tom.home (8.16.1/8.16.1/Submit) id 20R20RNt093532; Thu, 27 Jan 2022 04:00:27 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 27 Jan 2022 04:00:27 +0200 From: Konstantin Belousov To: Mateusz Guzik Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b58ca5df0bb7 - main - vfs: remove the now unused insmntque1 Message-ID: References: <202201270012.20R0CSKh002681@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202201270012.20R0CSKh002681@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.5 X-Spam-Checker-Version: SpamAssassin 3.4.5 (2021-03-20) on tom.home X-Rspamd-Queue-Id: 4JkkMF1rptz3nvC X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mx1.freebsd.org: 2001:470:d5e7:1::1 is neither permitted nor denied by domain of kostikbel@gmail.com) smtp.mailfrom=kostikbel@gmail.com X-Spamd-Result: default: False [1.00 / 15.00]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FREEMAIL_FROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; NEURAL_SPAM_MEDIUM(1.00)[1.000]; TO_DN_SOME(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_SPAM_LONG(1.00)[0.999]; MLMMJ_DEST(0.00)[dev-commits-src-all,dev-commits-src-main]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; FREEMAIL_ENVFROM(0.00)[gmail.com]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none] X-ThisMailContainsUnwantedMimeParts: N On Thu, Jan 27, 2022 at 12:12:28AM +0000, Mateusz Guzik wrote: > The branch main has been updated by mjg: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b58ca5df0bb79f2d1c443617e0899602721ccffa > > commit b58ca5df0bb79f2d1c443617e0899602721ccffa > Author: Mateusz Guzik > AuthorDate: 2022-01-27 00:00:24 +0000 > Commit: Mateusz Guzik > CommitDate: 2022-01-27 00:00:24 +0000 > > vfs: remove the now unused insmntque1 > > Bump __FreeBSD_version to 1400052. > --- > sys/kern/vfs_subr.c | 12 +----------- > sys/sys/param.h | 2 +- > sys/sys/vnode.h | 2 -- > 3 files changed, 2 insertions(+), 14 deletions(-) > > diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c > index 3218a3f7b6a0..a29f64fddd34 100644 > --- a/sys/kern/vfs_subr.c > +++ b/sys/kern/vfs_subr.c > @@ -1948,8 +1948,7 @@ insmntque_stddtr(struct vnode *vp, void *dtr_arg) > * Insert into list of vnodes for the new mount point, if available. > */ > int > -insmntque1(struct vnode *vp, struct mount *mp, > - void (*dtr)(struct vnode *, void *), void *dtr_arg) > +insmntque(struct vnode *vp, struct mount *mp) > { > > KASSERT(vp->v_mount == NULL, > @@ -1974,8 +1973,6 @@ insmntque1(struct vnode *vp, struct mount *mp, > (vp->v_vflag & VV_FORCEINSMQ) == 0) { > VI_UNLOCK(vp); > MNT_IUNLOCK(mp); > - if (dtr != NULL) > - dtr(vp, dtr_arg); And how is it supposed to work? For insmntque(), the default destructor resets vnode vop vector to deadfs_vops, before calling vgone(). Now consider any original user of insmntque(), like msdosfs: nvp->v_data = ldep; ... error = insmntque(nvp, mntp); if (error != 0) { free(ldep, M_MSDOSFSNODE); Isn't ldep is now freed twice? > return (EBUSY); > } > vp->v_mount = mp; > @@ -1989,13 +1986,6 @@ insmntque1(struct vnode *vp, struct mount *mp, > return (0); > } > > -int > -insmntque(struct vnode *vp, struct mount *mp) > -{ > - > - return (insmntque1(vp, mp, insmntque_stddtr, NULL)); > -} > - > /* > * Flush out and invalidate all buffers associated with a bufobj > * Called with the underlying object locked. > diff --git a/sys/sys/param.h b/sys/sys/param.h > index 948a34da94ec..6bf688105329 100644 > --- a/sys/sys/param.h > +++ b/sys/sys/param.h > @@ -76,7 +76,7 @@ > * cannot include sys/param.h and should only be updated here. > */ > #undef __FreeBSD_version > -#define __FreeBSD_version 1400051 > +#define __FreeBSD_version 1400052 > > /* > * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, > diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h > index a1dbdcff4cb5..390cb8791f54 100644 > --- a/sys/sys/vnode.h > +++ b/sys/sys/vnode.h > @@ -689,8 +689,6 @@ int getnewvnode(const char *tag, struct mount *mp, struct vop_vector *vops, > struct vnode **vpp); > void getnewvnode_reserve(void); > void getnewvnode_drop_reserve(void); > -int insmntque1(struct vnode *vp, struct mount *mp, > - void (*dtr)(struct vnode *, void *), void *dtr_arg); > int insmntque(struct vnode *vp, struct mount *mp); > u_quad_t init_va_filerev(void); > int speedup_syncer(void);