From nobody Mon Feb 07 09:50:48 2022 X-Original-To: dev-commits-src-branches@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 C3F9F19C11C4; Mon, 7 Feb 2022 09:50:49 +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 4JshGd0Qr4z3sN0; Mon, 7 Feb 2022 09:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644227449; 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=Vi2AVfeUtgXtMFeSfnd7ZJKaSyi6ZVQylAUGiEuRs+g=; b=E1b1z1GuU27LcfLqbVHPNQCeRbAN6/7rGfCA6g9P4SNK6MGJA5mXY5fdPjx1p7xw/a+PeE HajNpYeoXzHrGuJhTtpYWmEu2IvuVU5hQLQiXSt5rjlB2YZMgLw/m7mdgeY3Nmhhir+UEg J/DqZjw8if+3qZrDBVG7yRWKMbH/QuxThUYSHTEveL7mWlTUwU3HtrtoqJgL4pouqsv3+s qlHZe0UkgJVFp5STK5C0z3CTp7wIP0if8gqSdf/DU7ygCnzwy26I5gUrAmijJyiBkmjkJk HYBciG61SVkVotzzgI9CIhKGQuETYa6KxrhDwMnO90Zoayuck6EWa1JeVi4c8w== 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 D471323741; Mon, 7 Feb 2022 09:50:48 +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 2179om2v058929; Mon, 7 Feb 2022 09:50:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2179omVi058928; Mon, 7 Feb 2022 09:50:48 GMT (envelope-from git) Date: Mon, 7 Feb 2022 09:50:48 GMT Message-Id: <202202070950.2179omVi058928@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: 6939af9c1280 - stable/13 - ext2fs: remove remnants of the UFS snapshot code List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6939af9c12800bb27ae52f39155dd7e00cc1b35e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644227449; 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=Vi2AVfeUtgXtMFeSfnd7ZJKaSyi6ZVQylAUGiEuRs+g=; b=QACk3z4ynCg9rVZ/ws0dOXB4C07QolGxwNXuPuXfoQKGTOkcJ0nAbRtWNY2EsSuk2nSPpc c1XQ2UTQpVtMACqSbCRAQLXmoO6TKTYmC/EoOg4i6xZG+Z/Fk1nEaTVUB8cEB0EiQr9tcJ eOkqZDnbqyyn0az/04slIa4o7S3dIVdsvexObFZRJ9abv6vRsqqHkPtFZchoANzIMK3pK1 qsYbVeRKZm7xaBo50cI255287I5gyrc9Sn2xUijSiVLFlKJ0Gpx3jE9z+XUBLkj9ZZri7C GwJMxGzOWGgcq028/BJPZM1WA5KdlVMw2Qt4VcJC0G0Ccv65zBVL55mKW+htmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644227449; a=rsa-sha256; cv=none; b=P6WXcm2uR88JB3wXPrRQ1fAxANQLf6GvdL5A6xxNSHqLthzfLSOkjNN39VvKhGlSQunZH0 s+sVuuOLxIVN5Q4HYKcIZpWnSm3clPa3ttCADgkDKUBAtjadaGkIO+S1izcGmN3S2X6/Ij cXQi8wx6B8QVNNcVvMjvE8wTNIulqU4cmwiWQcSgdRALRgKNeRPctCJPwj6c7jZNnWQrWN YDFl/WVlM80sRgQWWc+YoCdangabttoSRAKmyQpdZlH8hMmFTQilj6Sjf6LSWsauGytlDx UlmAR2QmtRGml6TQPKM3/RRUx09URymU+woovd3QlxUgFqGpxKYCABfgizIdPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6939af9c12800bb27ae52f39155dd7e00cc1b35e commit 6939af9c12800bb27ae52f39155dd7e00cc1b35e Author: Konstantin Belousov AuthorDate: 2022-01-30 01:52:27 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-07 09:38:49 +0000 ext2fs: remove remnants of the UFS snapshot code (cherry picked from commit 9cd59de2e19b032fcbe6a9e7524b00e73a1a761c) --- sys/fs/ext2fs/ext2_bmap.c | 13 +------------ sys/fs/ext2fs/ext2_vnops.c | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/sys/fs/ext2fs/ext2_bmap.c b/sys/fs/ext2fs/ext2_bmap.c index 49963c8a92a1..412f08b871e0 100644 --- a/sys/fs/ext2fs/ext2_bmap.c +++ b/sys/fs/ext2fs/ext2_bmap.c @@ -308,17 +308,6 @@ ext2_bmaparray(struct vnode *vp, daddr_t bn, daddr_t *bnp, int *runp, int *runb) if (bp) bqrelse(bp); - /* - * Since this is FFS independent code, we are out of scope for the - * definitions of BLK_NOCOPY and BLK_SNAP, but we do know that they - * will fall in the range 1..um_seqinc, so we use that test and - * 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) { - *bnp = -1; - return (0); - } *bnp = blkptrtodb(ump, daddr); if (*bnp == 0) { *bnp = -1; @@ -356,7 +345,7 @@ ext2_bmap_seekdata(struct vnode *vp, off_t *offp) mp = vp->v_mount; ump = VFSTOEXT2(mp); - if (vp->v_type != VREG || (ip->i_flags & SF_SNAPSHOT) != 0) + if (vp->v_type != VREG) return (EINVAL); if (*offp < 0 || *offp >= ip->i_size) return (ENXIO); diff --git a/sys/fs/ext2fs/ext2_vnops.c b/sys/fs/ext2fs/ext2_vnops.c index 63909b7df987..724690403809 100644 --- a/sys/fs/ext2fs/ext2_vnops.c +++ b/sys/fs/ext2fs/ext2_vnops.c @@ -342,7 +342,7 @@ ext2_access(struct vop_access_args *ap) } /* If immutable bit set, nobody gets to write it. */ - if ((accmode & VWRITE) && (ip->i_flags & (SF_IMMUTABLE | SF_SNAPSHOT))) + if ((accmode & VWRITE) && (ip->i_flags & SF_IMMUTABLE)) return (EPERM); error = vaccess(vp->v_type, ip->i_mode, ip->i_uid, ip->i_gid,