[sheepdog] [PATCH 02/10] tests: use mkfs.ext3 only for _make_device

Liu Yuan namei.unix at gmail.com
Sun May 26 15:40:35 CEST 2013


This is a preparation patch for 'remove -s option'. After '-s' is removed,
since every file system has its own metadata allocation mechanism, so we can't
use different file system to get the same size after formatting.

Signed-off-by: Liu Yuan <namei.unix at gmail.com>
---
 tests/common.rc |   20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/tests/common.rc b/tests/common.rc
index 82314a2..0d5935b 100644
--- a/tests/common.rc
+++ b/tests/common.rc
@@ -366,24 +366,8 @@ _make_device()
         _die "failed to create $STORE/$idx.img"
     fi
 
-    fstype="$(df -T / | tail -1 | awk '{print $2}')"
-    case $fstype in
-        ext2)
-            mkops="-t $fstype -q -F"
-            mntops="-o user_xattr"
-            ;;
-        ext[3-4])
-            mkops="-t $fstype -q -F -J size=4"
-            mntops="-o user_xattr"
-            ;;
-        xfs)
-            mkops="-t $fstype -f"
-            mntops=""
-            ;;
-        *)
-            _die  "For now we only support xfs and ext*."
-            ;;
-    esac
+    mkops="-t ext3 -q -F -J size=4"
+    mntops="-o user_xattr"
 
     mkfs $mkops $STORE/$idx.img > $seq.full 2>&1
     mkdir $STORE/$idx
-- 
1.7.9.5



More information about the sheepdog mailing list