D34095.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D34095.id.diff
View Options

	diff --git a/sys/fs/ext2fs/ext2_bmap.c b/sys/fs/ext2fs/ext2_bmap.c
	--- a/sys/fs/ext2fs/ext2_bmap.c
	+++ b/sys/fs/ext2fs/ext2_bmap.c
	@@ -308,17 +308,6 @@
	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 @@
	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
	--- a/sys/fs/ext2fs/ext2_vnops.c
	+++ b/sys/fs/ext2fs/ext2_vnops.c
	@@ -339,7 +339,7 @@
	}

	/* 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,