| Message ID | 20170531130820.17634-5-jlayton@redhat.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Wed, May 31, 2017 at 09:08:19AM -0400, Jeff Layton wrote: > Signed-off-by: Jeff Layton <jlayton@redhat.com> > --- > common/rc | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/common/rc b/common/rc > index 391d36f373cd..83765aacfb06 100644 > --- a/common/rc > +++ b/common/rc > @@ -832,7 +832,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 $SCRATCH_LOGDEV && \ > + mkfs_cmd="$mkfs_cmd -J device=$SCRATCH_LOGDEV" Similar to that ext4 patch, need $MKFS_OPTIONS when creating journal device. Thanks, Eryu > + ;; > + ext2) > mkfs_cmd="$MKFS_PROG -t $FSTYP -- -F" > mkfs_filter="grep -v -e ^Warning: -e \"^mke2fs \"" > ;; > -- > 2.9.4 > > -- > To unsubscribe from this list: send the line "unsubscribe fstests" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/common/rc b/common/rc index 391d36f373cd..83765aacfb06 100644 --- a/common/rc +++ b/common/rc @@ -832,7 +832,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 $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 \"" ;;
Signed-off-by: Jeff Layton <jlayton@redhat.com> --- common/rc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)