Btrfs devel - Sep 2013 - [PATCH] xfstest/btrfs/001: fix the misuse of subvolume set-default

The command is
btrfs subvolume set-default <subvolid> <path>.

It uses @subvolid to control the default subvolume and
@subvolid=0 has always been parsed into FS_TREE no matter
what subvolume @path points to.

So in order to set a subvolume to the default one, we need
to get the id of this subvolume first.

Also fix a typo:
s/sbuvolid/subvolid/g

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
---
 tests/btrfs/001     |    5 +++--
 tests/btrfs/001.out |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/btrfs/001 b/tests/btrfs/001
index 9aa2431..1864e01 100755
--- a/tests/btrfs/001
+++ b/tests/btrfs/001
@@ -77,12 +77,13 @@ 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
+subid=`$BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | grep subvol | awk
''{print $2}''`
+$BTRFS_UTIL_PROG subvolume set-default $subid $SCRATCH_MNT | _filter_scratch
 _scratch_remount
 echo "List root dir which is now subvol"
 ls $SCRATCH_MNT
 _scratch_unmount
-echo "Mounting sbuvolid=0 for the root dir"
+echo "Mounting subvolid=0 for the root dir"
 _scratch_mount "-o subvolid=0"
 echo "List root dir"
 ls $SCRATCH_MNT
diff --git a/tests/btrfs/001.out b/tests/btrfs/001.out
index c782bde..7810c27 100644
--- a/tests/btrfs/001.out
+++ b/tests/btrfs/001.out
@@ -22,7 +22,7 @@ Creating file bar in subvol
 Setting subvol to the default
 List root dir which is now subvol
 bar
-Mounting sbuvolid=0 for the root dir
+Mounting subvolid=0 for the root dir
 List root dir
 snap
 subvol
-- 
1.7.7

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

On Mon, Sep 23, 2013 at 04:47:29PM +0800, Liu Bo wrote:
> The command is
> btrfs subvolume set-default <subvolid> <path>.
> 
> It uses @subvolid to control the default subvolume and
> @subvolid=0 has always been parsed into FS_TREE no matter
> what subvolume @path points to.
> 
> So in order to set a subvolume to the default one, we need
> to get the id of this subvolume first.
> 
> Also fix a typo:
> s/sbuvolid/subvolid/g
> 
> Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Sent a patch for this already.  Thanks,

Josef
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

On Mon, Sep 23, 2013 at 09:17:46AM -0400, Josef Bacik
wrote:
> On Mon, Sep 23, 2013 at 04:47:29PM +0800, Liu Bo wrote:
> > The command is
> > btrfs subvolume set-default <subvolid> <path>.
> > 
> > It uses @subvolid to control the default subvolume and
> > @subvolid=0 has always been parsed into FS_TREE no matter
> > what subvolume @path points to.
> > 
> > So in order to set a subvolume to the default one, we need
> > to get the id of this subvolume first.
> > 
> > Also fix a typo:
> > s/sbuvolid/subvolid/g
> > 
> > Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
> 
> Sent a patch for this already.  Thanks,
oops, sorry I should have noticed that, any chance to fold the typo fix
into your patch?

-liubo

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs