From nobody Mon Jan 31 02:46:56 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 25489197F557; Mon, 31 Jan 2022 02:46:58 +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 4JnCBn5PvFz3FCR; Mon, 31 Jan 2022 02:46:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643597218; 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=Gc2SJKgZg787azIQaMKqJ2whx/YxjSlJdXY8LPoESrM=; b=eu94PoKiKfhTs8wp52vH/EVYhHLFWVQQ1HrmFs/FziDhsmk8BLOslk1gJSbJbvr/HgMdjO eRC1K8rDECTwCyRQ1PoQDFfAci2wFXO2tzxXrfArmkmTcINzD2673QZOLXNwXNR/J1j/YG MtyOUQjN5YG16eJZBg+mXaqIitPYo6BSsignHnEu/tF8l/SPi4hb1++RFTFg0Qif3zotnh wAXE4eAIKL9UFp9wYvH1DjGe54UWwgi1pO+NqUPntILmRuU/x9hwwNgGHbV9l2xz30uNID j+PkoKm1wxjNtkaLG7y2mcLlNJCiBu1XK3KHKJYqNjQhmA9X3K9PDNPMlTOayA== 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 D924D1467F; Mon, 31 Jan 2022 02:46:56 +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 20V2kujk009115; Mon, 31 Jan 2022 02:46:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20V2kuub009114; Mon, 31 Jan 2022 02:46:56 GMT (envelope-from git) Date: Mon, 31 Jan 2022 02:46:56 GMT Message-Id: <202201310246.20V2kuub009114@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 0cdc6033087a - main - ufs: Use IS_SNAPSHOT() 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cdc6033087ac28640fa750a4dc4676107d4f364 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643597218; 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=Gc2SJKgZg787azIQaMKqJ2whx/YxjSlJdXY8LPoESrM=; b=dk9Pv+5Gar3vn1AlIJoCWkZonVPC8J2H5RsNbkI2Iw8OiJcTAGuRxE21PDmAvZY19Kxd7k 5E5+zayxrYZQPbPGdcDnAt0sFCYjG9dj+vtQwkEKnWU1xTz7kpkmk4RJCknkX3bjVYhw92 g7GuChF51u9AzQlAflzLYHuz3vjRbkBExrFglebyJiKXtOZqAoL+Nb3SZwkwHJtCuGoSS7 /cNMx8phVeAxz2+ZjVMsxhkIc7BgQ15T8Objq67Mt2KuTdiBGYyRxj29ahL5iuXqoUp4is XjbTEOnc6KqQN4pPvWBM5o88MJykexyz0flv3bUyGs7MC6XYglMC5/oyDQVwQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643597218; a=rsa-sha256; cv=none; b=sRvVE2jQGN37s/gCQfcVTBYhIbZI+XGwvvtn4HHxN1Zej7KSPJYTMppm4fQ3W/T0ndaNqx GkiquPlmtw34fhSzGBmd4sBUhIbxHKHynrzpA4TSL+yky/2hSjcgmok1WPZNM065TlP7eQ ivHCNQaPkm8aHBd13Bd0xiCWcwhmbzQb2wJxJAIKzeicyeUkom/iyaWckx5H2qJgJ4TAye qQQp7CZdPi2xE33GsDlWe/BOGIFdA3XY6TvEjbW4s+f4qRK1iV3kSIrlyHzaZ7IjudTT9X RTxuzFSzaj6IqA4jrXMtOPDYKQap7Z0OwA0Sv62SNRP9MdbbUyb4gb2fPsQilg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0cdc6033087ac28640fa750a4dc4676107d4f364 commit 0cdc6033087ac28640fa750a4dc4676107d4f364 Author: Konstantin Belousov AuthorDate: 2022-01-20 13:17:59 +0000 Commit: Konstantin Belousov CommitDate: 2022-01-31 02:46:21 +0000 ufs: Use IS_SNAPSHOT() Reviewed by: markj, mckusick Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D34072 --- sys/ufs/ufs/ufs_bmap.c | 14 ++++++-------- sys/ufs/ufs/ufs_lookup.c | 5 ++--- sys/ufs/ufs/ufs_vnops.c | 10 +++++----- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index b60c93fb9105..5b9a16782cf7 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -217,14 +217,12 @@ ufs_bmaparray(vp, bn, bnp, nbp, runp, runb) * return a request for a zeroed out buffer if attempts * are made to read a BLK_NOCOPY or BLK_SNAP block. */ - if ((ip->i_flags & SF_SNAPSHOT) && DIP(ip, i_db[bn]) > 0 && + if (IS_SNAPSHOT(ip) && DIP(ip, i_db[bn]) > 0 && DIP(ip, i_db[bn]) < ump->um_seqinc) { *bnp = -1; } else if (*bnp == 0) { - if (ip->i_flags & SF_SNAPSHOT) - *bnp = blkptrtodb(ump, bn * ump->um_seqinc); - else - *bnp = -1; + *bnp = IS_SNAPSHOT(ip) ? blkptrtodb(ump, + bn * ump->um_seqinc) : -1; } else if (runp) { ufs2_daddr_t bnb = bn; for (++bn; bn < UFS_NDADDR && *runp < maxrun && @@ -320,13 +318,13 @@ ufs_bmaparray(vp, bn, bnp, nbp, runp, runb) * return a request for a zeroed out buffer if attempts are made * to read a BLK_NOCOPY or BLK_SNAP block. */ - if ((ip->i_flags & SF_SNAPSHOT) && daddr > 0 && daddr < ump->um_seqinc){ + if (IS_SNAPSHOT(ip) && daddr > 0 && daddr < ump->um_seqinc){ *bnp = -1; return (0); } *bnp = blkptrtodb(ump, daddr); if (*bnp == 0) { - if (ip->i_flags & SF_SNAPSHOT) + if (IS_SNAPSHOT(ip)) *bnp = blkptrtodb(ump, bn * ump->um_seqinc); else *bnp = -1; @@ -367,7 +365,7 @@ ufs_bmap_seekdata(vp, offp) mp = vp->v_mount; ump = VFSTOUFS(mp); - if (vp->v_type != VREG || (ip->i_flags & SF_SNAPSHOT) != 0) + if (vp->v_type != VREG || IS_SNAPSHOT(ip)) return (EINVAL); if (*offp < 0 || *offp >= ip->i_size) return (ENXIO); diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c index 3d24ad23f6e2..7f3358d2d7c4 100644 --- a/sys/ufs/ufs/ufs_lookup.c +++ b/sys/ufs/ufs/ufs_lookup.c @@ -1245,8 +1245,7 @@ out: * drop its snapshot reference so that it will be reclaimed * when last open reference goes away. */ - if (ip != NULL && (ip->i_flags & SF_SNAPSHOT) != 0 && - ip->i_effnlink == 0) + if (ip != NULL && IS_SNAPSHOT(ip) && ip->i_effnlink == 0) UFS_SNAPGONE(ip); return (error); } @@ -1320,7 +1319,7 @@ ufs_dirrewrite(dp, oip, newinum, newtype, isrmdir) * drop its snapshot reference so that it will be reclaimed * when last open reference goes away. */ - if ((oip->i_flags & SF_SNAPSHOT) != 0 && oip->i_effnlink == 0) + if (IS_SNAPSHOT(oip) && oip->i_effnlink == 0) UFS_SNAPGONE(oip); return (error); } diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 1d0525bcbe0c..f32953f19a23 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -702,7 +702,7 @@ ufs_setattr(ap) */ if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); - if ((ip->i_flags & SF_SNAPSHOT) != 0) + if (IS_SNAPSHOT(ip)) return (EPERM); break; default: @@ -726,7 +726,7 @@ ufs_setattr(ap) vap->va_birthtime.tv_sec != VNOVAL) { if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); - if ((ip->i_flags & SF_SNAPSHOT) != 0) + if (IS_SNAPSHOT(ip)) return (EPERM); error = vn_utimes_perm(vp, vap, cred, td); if (error != 0) @@ -754,8 +754,8 @@ ufs_setattr(ap) if (vap->va_mode != (mode_t)VNOVAL) { if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); - if ((ip->i_flags & SF_SNAPSHOT) != 0 && (vap->va_mode & - (S_IXUSR | S_IWUSR | S_IXGRP | S_IWGRP | S_IXOTH | S_IWOTH))) + if (IS_SNAPSHOT(ip) && (vap->va_mode & (S_IXUSR | S_IWUSR | + S_IXGRP | S_IWGRP | S_IXOTH | S_IWOTH)) != 0) return (EPERM); error = ufs_chmod(vp, (int)vap->va_mode, cred, td); } @@ -1022,7 +1022,7 @@ ufs_remove(ap) error = ufs_dirremove(dvp, ip, ap->a_cnp->cn_flags, 0); if (ip->i_nlink <= 0) vp->v_vflag |= VV_NOSYNC; - if ((ip->i_flags & SF_SNAPSHOT) != 0) { + if (IS_SNAPSHOT(ip)) { /* * Avoid deadlock where another thread is trying to * update the inodeblock for dvp and is waiting on