From: Kefu Chai <kchai@redhat.com>
Date: Fri, 15 Sep 2017 03:51:45 +0000 (+0800)
Subject: qa/standalone/ceph-helpers.sh: pass btrfs subvolume options the right way
X-Git-Tag: v12.2.11~56^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c29997b3e1e65ab2a91f77aab4960c9067e0c6c8;p=ceph.git

qa/standalone/ceph-helpers.sh: pass btrfs subvolume options the right way

with the latest btrfs-progs, it complains with

$ sudo btrfs subvolume list . -t
btrfs subvolume list: too many arguments

so, we need to pass `-t` right after `list` subcommand.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 279d2980faade79e5032ad06616706313e231bd9)
---

diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh
index dc1843bdbeb8..6ee3c143154a 100755
--- a/qa/standalone/ceph-helpers.sh
+++ b/qa/standalone/ceph-helpers.sh
@@ -203,7 +203,7 @@ function teardown() {
 function __teardown_btrfs() {
     local btrfs_base_dir=$1
     local btrfs_root=$(df -P . | tail -1 | awk '{print $NF}')
-    local btrfs_dirs=$(cd $btrfs_base_dir; sudo btrfs subvolume list . -t | awk '/^[0-9]/ {print $4}' | grep "$btrfs_base_dir/$btrfs_dir")
+    local btrfs_dirs=$(cd $btrfs_base_dir; sudo btrfs subvolume list -t . | awk '/^[0-9]/ {print $4}' | grep "$btrfs_base_dir/$btrfs_dir")
     for subvolume in $btrfs_dirs; do
        sudo btrfs subvolume delete $btrfs_root/$subvolume
     done