From: Naohiro Aota <naohiro.aota@wdc.com>
Date: Wed, 11 Aug 2021 15:12:26 +0000 (+0900)
Subject: common/rc: fix blocksize detection for btrfs
X-Git-Tag: v2022.05.01~289
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=40360a4264d40ccf7dd094e446307567839547e6;p=xfstests-dev.git

common/rc: fix blocksize detection for btrfs

Mkfs.btrfs's "-b" does not specify the block size but the file system size.
Use "-s" to detect it instead.

Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
---

diff --git a/common/rc b/common/rc
index 4cb062e2..7b80820f 100644
--- a/common/rc
+++ b/common/rc
@@ -978,7 +978,10 @@ _scratch_mkfs_sized()
 	xfs)
 		def_blksz=`echo $MKFS_OPTIONS | sed -rn 's/.*-b ?size= ?+([0-9]+).*/\1/p'`
 		;;
-	ext2|ext3|ext4|ext4dev|udf|btrfs|reiser4|ocfs2|reiserfs)
+	btrfs)
+		def_blksz=`echo $MKFS_OPTIONS | sed -rn 's/.*-s ?+([0-9]+).*/\1/p'`
+		;;
+	ext2|ext3|ext4|ext4dev|udf|reiser4|ocfs2|reiserfs)
 		def_blksz=`echo $MKFS_OPTIONS | sed -rn 's/.*-b ?+([0-9]+).*/\1/p'`
 		;;
 	jfs)