On Wed, Dec 23, 2015 at 11:49 PM, Dave Chinner <david@xxxxxxxxxxxxx> wrote: > On Tue, Dec 22, 2015 at 02:22:40AM +0000, fdmanana@xxxxxxxxxx wrote: >> From: Filipe Manana <fdmanana@xxxxxxxx> >> >> Commit 27d077ec0bda (common: use mount/umount helpers everywhere) made >> a few btrfs test fail for 2 different reasons: >> >> 1) Some tests (btrfs/029 and btrfs/031) use $SCRATCH_MNT as a mount >> point for some subvolume created in $TEST_DEV, therefore calling >> _scratch_unmount does not work as it passes $SCRATCH_DEV as the >> argument to the umount program. This is intentional to test reflinks >> accross different mountpoints of the same filesystem but for different >> subvolumes; > > The correct way to fix this is to stop abusing $SCRATCH_MNT and > to instead use a local mount point on the test device.... > >> 2) For multiple devices filesystems (btrfs/003 and btrfs/011) that test >> the device replace feature, we need to unmount using the mount path >> ($SCRATCH_MNT) because unmounting using one of the devices as an >> argument ($SCRATCH_DEV) does not always work - after replace operations >> we get in /proc/mounts a device other than $SCRATCH_DEV associated >> with the mount point $SCRATCH_MNT (this is mentioned in a comment at >> btrfs/011 for example), so we need to pass that other device to the >> umount program or pass it the mount point. > > Which says to that _scratch_unmount should be using $SCRATCH_MNT > rather than $SCRATCH_DEV. That would fix the problem without needing > to modify any of the tests, right? > >> Using $SCRATCH_MNT as a mountpoint for a device other than $SCRATCH_DEV is >> misleading, but that's a different problem that existed long before and >> this change attempts only to fix the regression from 27d077ec0bda. > > It may be misleading, but that's the fundamental problem that needs > fixing. As always, we should be trying to fix the root cause of the > problem, not working around them... Sure, it's xmas season after all. I'll cleanup the tests and not just undo the regression. Thanks. > > Cheers, > > Dave. > -- > Dave Chinner > david@xxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
