From nobody Wed Sep 14 22:52:12 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 4MSbF91n5Lz4cPCG; Wed, 14 Sep 2022 22:52:13 +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 4MSbF914XSz3ntq; Wed, 14 Sep 2022 22:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663195933; 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=bMLgkjuuxyaj+4Q1/UK1b4BignleDGTWqu27LjZVekc=; b=wUskUV4fGZ2JFD0NFD5niS7h+t68xSEOIY4ZFVY+3AtFaMsvMZOTB64mPXc1lRZCH+GMw4 d7eW7cqawtB1NPBfCY6UlzIaoNkdfp/Z9PyZvcg3uX35ZgJoeBZEgUG9pQN1wsGTedm7Rd XHJdUEytUPDiDxmoUoPjxZpw5oSo8FdeaZnVMXFTTd3THyycaRuabHaStWJ9SW07X8vijH ULnHJNcFTjlVGzDLpM8nM2lGcIA+dqpowrKo8s2qObJZ1/ftDw2jBJycdeTKRuz65fIV3Y DUnoPpkQvuzqyvKuXe+1mbXViftQN5DQEM9a7fgi1MU0bwu3nZ52QYLWq0BMiQ== 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 4MSbF908XkzppV; Wed, 14 Sep 2022 22:52:13 +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 28EMqC9W031588; Wed, 14 Sep 2022 22:52:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28EMqCpI031587; Wed, 14 Sep 2022 22:52:12 GMT (envelope-from git) Date: Wed, 14 Sep 2022 22:52:12 GMT Message-Id: <202209142252.28EMqCpI031587@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: a1c555f48ba4 - main - devfs: retire the unused DEVFS_DEL_VNLOCKED flag 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=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: a1c555f48ba46bcd0f13a261e164b158dc97315b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663195933; 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=bMLgkjuuxyaj+4Q1/UK1b4BignleDGTWqu27LjZVekc=; b=LxCnkCGmGPdQdiZDgVpBHpxZGUBUVsWjcuslu4PnRoalKZbe0eSEnGpGuIGYtbIHW4a4OH crZ3pHDdGKhot3FrDkWFxzy/T2HEqKysNBFGkBsVflpdrJpE8GY9+udiCX7sjgRtpndumm uFWnAXFwKoyz3jS4e15k1cCd1cAYdSOrzwlggmHj5L/YLNNmuqkcBTN/IHyDzJOOgqnFPt OrjITgNXZ1cLiJQaZhk4Laurm/6FFXEdutkPAqLBEfbDS+0PQc4JEyfPjS5cZehuq5i4zr akQwZ/JLLlyroC86DpivHZSLsAqUWWk1OxvJWTkxX0lW8ppZBirkHyZOi0PZaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663195933; a=rsa-sha256; cv=none; b=KMS5ZGvj/IjNziCuZY4Jt++8BaeziaOYlsdc/F5pp/fJo7WLa0VN0ryPcvBQhq1DHSYREj YD7HTveUhBfS/9Ba50dCC2Ch9o6rs7UHhFWPlS+C9c9sWblSzYHH+ypZ4YkmmQoKg0b6mS 9Sl4pPfawsBTVEfks0Wvbb7Pccg73ViU5W6L1tFHav9DDkrkyQbJoIrekH6QOFTOqoZOrr ZGg6ME6y60TdmVSCg3A3wwFbx8hht/Ad9japXSD/wg+RYD724alyY68LgNOIGnXchPiSbG IwgPs3/NGg8RV57EAmvXnchi+dDVdVp46LbVE+MqwC5C/kwmyeXI+wE1LuMVdw== 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=a1c555f48ba46bcd0f13a261e164b158dc97315b commit a1c555f48ba46bcd0f13a261e164b158dc97315b Author: Mateusz Guzik AuthorDate: 2022-09-14 22:47:53 +0000 Commit: Mateusz Guzik CommitDate: 2022-09-14 22:47:53 +0000 devfs: retire the unused DEVFS_DEL_VNLOCKED flag --- sys/fs/devfs/devfs.h | 3 +-- sys/fs/devfs/devfs_devs.c | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/sys/fs/devfs/devfs.h b/sys/fs/devfs/devfs.h index b62438ff6730..ef8a027a5bcb 100644 --- a/sys/fs/devfs/devfs.h +++ b/sys/fs/devfs/devfs.h @@ -185,8 +185,7 @@ extern unsigned devfs_rule_depth; #define DEVFS_DMP_HOLD(dmp) ((dmp)->dm_holdcnt++) #define DEVFS_DMP_DROP(dmp) (--(dmp)->dm_holdcnt == 0) -#define DEVFS_DEL_VNLOCKED 0x01 -#define DEVFS_DEL_NORECURSE 0x02 +#define DEVFS_DEL_NORECURSE 0x01 void devfs_rules_apply(struct devfs_mount *, struct devfs_dirent *); void devfs_rules_cleanup(struct devfs_mount *); diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c index 19619d94ba1c..e8786e965500 100644 --- a/sys/fs/devfs/devfs_devs.c +++ b/sys/fs/devfs/devfs_devs.c @@ -401,13 +401,9 @@ devfs_delete(struct devfs_mount *dm, struct devfs_dirent *de, int flags) mtx_unlock(&devfs_de_interlock); vholdl(vp); sx_unlock(&dm->dm_lock); - if ((flags & DEVFS_DEL_VNLOCKED) == 0) - vn_lock(vp, LK_EXCLUSIVE | LK_INTERLOCK | LK_RETRY); - else - VI_UNLOCK(vp); + vn_lock(vp, LK_EXCLUSIVE | LK_INTERLOCK | LK_RETRY); vgone(vp); - if ((flags & DEVFS_DEL_VNLOCKED) == 0) - VOP_UNLOCK(vp); + VOP_UNLOCK(vp); vdrop(vp); sx_xlock(&dm->dm_lock); } else