From nobody Thu Jan 27 00:12:28 2022 X-Original-To: dev-commits-src-main@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 B903A196B82C; Thu, 27 Jan 2022 00:12:32 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JkgyQ5QPQz4bYY; Thu, 27 Jan 2022 00:12:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643242351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NvR8WLB+rNpB0LQJhSYA0s5togsz0lvwasMJa8FKYZ0=; b=WE3dH8yhIJyFvLv3kGb7MGPBBjjrQeDhb0NPu+JuvWpft1B5Sdw7nLx/dQj/ht8+0vLJUD +cVDIXO+RoMgm5QdP3aJfoMp4Yh9ZuzRJ7hk35N1MdkY6cQTywZkLNjUVoZZAmxMv99iBK n+pYRfJLZn7kDZNGb5famKuyQiGX29dBjxmA8e5qtgKa/gkykYHxoTUFxTcCx9ddsX1s5R ebnZgtJ/a9fJA5AV87gmd9sDxUSCBceEJ8ysASGMdQKjn2DdY4YNknKcgLRlQui276WRNe GNh3er3b4nSn0crmq9wg2Asq0AgAxUX8R4XQK8lHN9Gr29S4MMS58fRRJPPKeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0E3794696; Thu, 27 Jan 2022 00:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20R0CSJf002682; Thu, 27 Jan 2022 00:12:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20R0CSKh002681; Thu, 27 Jan 2022 00:12:28 GMT (envelope-from git) Date: Thu, 27 Jan 2022 00:12:28 GMT Message-Id: <202201270012.20R0CSKh002681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: b58ca5df0bb7 - main - vfs: remove the now unused insmntque1 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b58ca5df0bb79f2d1c443617e0899602721ccffa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643242351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NvR8WLB+rNpB0LQJhSYA0s5togsz0lvwasMJa8FKYZ0=; b=Sv524p05kAA0DpkRDj8a48QNxfwUkUD8hjWTZdrRY27Txt2srseh2A6KyWhk/Z8oCOH8OR 77WURJaiJwmucezyoRuPRAXF6YW0lfp1MX55x2gs/UWLqljZBGaDo243+SeVDA5U4XU62x yfd00U+A3/T/Y/DfaCPv+OVXTtyvH1ZMZIzIIBFXpoOTvqS+EaLBS74tDKv2+Ifkjeubml Pk2MEvRza4+8Zy6bfp2qJZmhQNGh8wbeB/6j8rj9kK8Qsy18sExyYrgjMH813zCvhj98lh TukUNlEwUH8tNF/Z+xGwHmwtH7wG0Hu8QA36uflEOSJco4oN2CJnL71i8TrCNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643242351; a=rsa-sha256; cv=none; b=vdGq1ptxbmOooaEq8mY4bGeXOq9xGSau9HBMFIBPxdWTibyGddiHWDC0itvCmOgjd6W0WH oNvDSs4GUE6oI2Q7xej8sB5vjIw8IHNCerNRqAFqaEam4qzRcvBMxrrsLtLMOZezMdTVba bOAdLv9jvoFCrtbZNtp8UH3T4oqZzZS6S8Tfes8XhyPs5oxJwekKRQmk669cOCzAAodEDV jrlCKM9v15Msr9I+Llvy4a5rYSwuQoObRiPIOEruPc6g7hbtOVMRCjXfr64V5nSQK6hkmD pc7KQ1LWTfGVrD5GwxX53P/ErFUp122htItxzNHD8BlJ+8vj7Obo4TOOODGKuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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); 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);