From owner-dev-commits-src-branches@freebsd.org Wed Feb 24 07:59:04 2021 Return-Path: Delivered-To: dev-commits-src-branches@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 68BA0553D92; Wed, 24 Feb 2021 07:59:04 +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 4DlpGF025Rz4ZkF; Wed, 24 Feb 2021 07:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 75E6428B58; Wed, 24 Feb 2021 07:58:57 +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 11O7wvQQ046690; Wed, 24 Feb 2021 07:58:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11O7wv86046689; Wed, 24 Feb 2021 07:58:57 GMT (envelope-from git) Date: Wed, 24 Feb 2021 07:58:57 GMT Message-Id: <202102240758.11O7wv86046689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d72a156fb67d - stable/13 - ufs vnops: brace softdep_prelink() with DOINGSUJ instead of DOINGSOFTDEP MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d72a156fb67da00890137b8f1ec5f5117fbe7015 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Feb 2021 07:59:04 -0000 The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d72a156fb67da00890137b8f1ec5f5117fbe7015 commit d72a156fb67da00890137b8f1ec5f5117fbe7015 Author: Konstantin Belousov AuthorDate: 2021-01-23 23:12:39 +0000 Commit: Konstantin Belousov CommitDate: 2021-02-24 07:46:41 +0000 ufs vnops: brace softdep_prelink() with DOINGSUJ instead of DOINGSOFTDEP (cherry picked from commit 6aed2435c8bf1fa55891c7d30186c9ad91064da8) --- sys/ufs/ufs/ufs_vnops.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index b035a8b1c34d..e6a78c3655cc 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1006,7 +1006,7 @@ ufs_remove(ap) if ((ip->i_flags & (NOUNLINK | IMMUTABLE | APPEND)) || (VTOI(dvp)->i_flags & APPEND)) return (EPERM); - if (DOINGSOFTDEP(dvp)) { + if (DOINGSUJ(dvp)) { error = softdep_prelink(dvp, vp); if (error != 0) { MPASS(error == ERELOOKUP); @@ -1071,7 +1071,7 @@ ufs_link(ap) panic("ufs_link: no name"); #endif - if (DOINGSOFTDEP(tdvp)) { + if (DOINGSUJ(tdvp)) { error = softdep_prelink(tdvp, vp); if (error != 0) { MPASS(error == ERELOOKUP); @@ -1142,7 +1142,7 @@ ufs_whiteout(ap) struct direct newdir; int error = 0; - if (DOINGSOFTDEP(dvp) && (ap->a_flags == CREATE || + if (DOINGSUJ(dvp) && (ap->a_flags == CREATE || ap->a_flags == DELETE)) { error = softdep_prelink(dvp, NULL); if (error != 0) { @@ -1945,7 +1945,7 @@ ufs_mkdir(ap) goto out; } - if (DOINGSOFTDEP(dvp)) { + if (DOINGSUJ(dvp)) { error = softdep_prelink(dvp, NULL); if (error != 0) { MPASS(error == ERELOOKUP); @@ -2209,7 +2209,7 @@ ufs_rmdir(ap) error = EINVAL; goto out; } - if (DOINGSOFTDEP(dvp)) { + if (DOINGSUJ(dvp)) { error = softdep_prelink(dvp, vp); if (error != 0) { MPASS(error == ERELOOKUP); @@ -2736,7 +2736,7 @@ ufs_makeinode(mode, dvp, vpp, cnp, callfunc) print_bad_link_count(callfunc, dvp); return (EINVAL); } - if (DOINGSOFTDEP(dvp)) { + if (DOINGSUJ(dvp)) { error = softdep_prelink(dvp, NULL); if (error != 0) { MPASS(error == ERELOOKUP);