ext3: allow it to put journal on a separate device when doing scratch_mkfs
authorJeff Layton <jlayton@redhat.com>
Fri, 16 Jun 2017 19:36:16 +0000 (15:36 -0400)
committerEryu Guan <eguan@redhat.com>
Tue, 20 Jun 2017 12:29:46 +0000 (20:29 +0800)
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
common/rc

index ad67ea82a7626cd7077bfd820fd4e06e8c7d9a4c..2972f89e9527c0003ec1fa6dfde7c1fdf7c2c9c9 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -840,7 +840,16 @@ _scratch_mkfs()
                mkfs_cmd="$MKFS_BTRFS_PROG"
                mkfs_filter="cat"
                ;;
-       ext2|ext3)
+       ext3)
+               mkfs_cmd="$MKFS_PROG -t $FSTYP -- -F"
+               mkfs_filter="grep -v -e ^Warning: -e \"^mke2fs \""
+
+               # put journal on separate device?
+               [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
+               $mkfs_cmd -O journal_dev $MKFS_OPTIONS $SCRATCH_LOGDEV && \
+               mkfs_cmd="$mkfs_cmd -J device=$SCRATCH_LOGDEV"
+               ;;
+       ext2)
                mkfs_cmd="$MKFS_PROG -t $FSTYP -- -F"
                mkfs_filter="grep -v -e ^Warning: -e \"^mke2fs \""
                ;;