From: Josef Bacik Date: Wed, 18 Sep 2013 20:48:27 +0000 (+0000) Subject: xfstests: fix set-default test in btrfs/001 X-Git-Tag: v2022.05.01~3363 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d4bc9576f09992dfc76eb34bb1aca3e80eaee1e7;p=xfstests-dev.git xfstests: fix set-default test in btrfs/001 We were actually testing this improperly, there was a bug in the set default code so we weren't actually honoring the 0 subvolid properly. To fix this we need to get the subvolid for the subvol we want to set as the default and use that in the command. With this patch we now pass again with the fix for the 0 subvolid. Thanks, Signed-off-by: Josef Bacik Tested-by: David Sterba Reviewed-by: Rich Johnston Signed-off-by: Rich Johnston --- diff --git a/tests/btrfs/001 b/tests/btrfs/001 index 9aa24317..c05d7728 100755 --- a/tests/btrfs/001 +++ b/tests/btrfs/001 @@ -77,7 +77,8 @@ ls $SCRATCH_MNT/subvol echo "Creating file bar in subvol" dd if=/dev/zero of=$SCRATCH_MNT/subvol/bar bs=1M count=1 &> /dev/null echo "Setting subvol to the default" -$BTRFS_UTIL_PROG subvolume set-default 0 $SCRATCH_MNT/subvol | _filter_scratch +subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT subvol) +$BTRFS_UTIL_PROG subvolume set-default $subvolid $SCRATCH_MNT | _filter_scratch _scratch_remount echo "List root dir which is now subvol" ls $SCRATCH_MNT