From nobody Mon Jan 31 02:41:31 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 E3EE2197C812; Mon, 31 Jan 2022 02:41:31 +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 4JnC4W42wFz3Cbx; Mon, 31 Jan 2022 02:41:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643596891; 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=s1AFq1gJKPmAkraXW4r57E4KGj8wjzyNQZZ7n/dI5/U=; b=k48ybDAUMasaFLzT/54kIVj31mP69LzNT4O1Ep+J78r/HwMQe+aHENY+Khhv5U/Mp06LUb 3BspEAMtkQV/EHQyt1wLy2IZD8CaTEN/voDblVTZ+BZQvupqH+apeDllh2Bb20H/91SR+T EZ4jMe2t3Eg1BRNGq6Dm8mfFlcUYNibtuq4aySmiv2Awgrs+8uzjurY5kKcOsb1Pml4XsY 9rkI+4CpfzASHnjGfk3uXKpGEOftZ1XpNIcBPzkWbuy/UMEJx5SkDh4alE4HfDAh19hCc/ T6n8C8G5OEdSyoyN+oS9lLXUdtjvxy2EOeVa/qN1F4PNgfIcUpNTkmqtplUgGw== 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 6061D1466B; Mon, 31 Jan 2022 02:41:31 +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 20V2fV7H005407; Mon, 31 Jan 2022 02:41:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20V2fVtI005406; Mon, 31 Jan 2022 02:41:31 GMT (envelope-from git) Date: Mon, 31 Jan 2022 02:41:31 GMT Message-Id: <202201310241.20V2fVtI005406@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: 9cd59de2e19b - main - ext2fs: remove remnants of the UFS snapshot code 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: 9cd59de2e19b032fcbe6a9e7524b00e73a1a761c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643596891; 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=s1AFq1gJKPmAkraXW4r57E4KGj8wjzyNQZZ7n/dI5/U=; b=EUcHI5Kbn/CK4XpenlGxrtr2faot8txeDdZq4TIaNH5ujxqD+894qDiVJK7wwObyypj6Qh +z8pFOSmQMDsoNl/IW/zvI5+dTU/B/zgDKyvJd0/8UZsEFCAB0RXIUGigCkAC0hL/A6vbE CKdaTWxt7jHl1TurWL3ron/mCjpg33xwZy+1fzCSooymVuvXKVZkgm/b51NeTDAafzc+f2 kzyCVPjWHrNOSIN8fE1v7itI9GduUQGXZ/aD6mCx+sc4UWf9CpfNVNBK+4GJTzvcuX3sKl D3AfRQhsE6rrOH4PHTxxMlJM2OmO5Drg/7EUYgfRROAQXLVZk7/NAPmAgdD66Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643596891; a=rsa-sha256; cv=none; b=qnJGAczpOCVsJFUQdi2sqdU5/WEYHrWm8elmMMGv/Skc2QQGwzycl2lQvcT3rjUAFA3zrF xMU/j++sKFyqEQKDU8sk7P1nHIDc6KXSRG7/uSs7gG4pjUp+XqZPmD+0TDokBh5RFFxjUV ve7rCafpsfjCUtia+ikyD77R7pkIwRqCGFyrEHdkGzXk+bjmFyPdq60ruXuUsXIigZPGEc CW6PvPhJf8mN4/2Cj+7J7lnAjqY57HYzjC4+Plaj7gy3yARaz4Uo9LcyIvAtAHKQPmmJX2 NXvNSw/kmLcVtdkV+/z3m+anK62hhm9p8mIon+WrEgvgJCA8YAomscSfbXEtVA== 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=9cd59de2e19b032fcbe6a9e7524b00e73a1a761c commit 9cd59de2e19b032fcbe6a9e7524b00e73a1a761c Author: Konstantin Belousov AuthorDate: 2022-01-30 01:52:27 +0000 Commit: Konstantin Belousov CommitDate: 2022-01-31 02:37:16 +0000 ext2fs: remove remnants of the UFS snapshot code Noted and reviewed by: mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D34095 --- 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 f577241a457e..a00b2121308a 100644 --- a/sys/fs/ext2fs/ext2_vnops.c +++ b/sys/fs/ext2fs/ext2_vnops.c @@ -339,7 +339,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,