On Mon, Sep 14, 2020 at 06:44:24PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@xxxxxxxxxx> > > Modify the command that searches for the minimum log size message from > mkfs to handle external log devices correctly. > > Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> > --- Good to me, Reviewed-by: Zorro Lang <zlang@xxxxxxxxxx> > common/xfs | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > > diff --git a/common/xfs b/common/xfs > index f4a47dfb..6520ad29 100644 > --- a/common/xfs > +++ b/common/xfs > @@ -103,7 +103,7 @@ _scratch_find_xfs_min_logblocks() > # try again without MKFS_OPTIONS because that's what _scratch_do_mkfs > # will do if we pass in the log size option. > if [ $mkfs_status -ne 0 ] && > - ! grep -q 'log size.*too small, minimum' $tmp.mkfserr; then > + ! egrep -q '(log size.*too small, minimum|external log device.*too small, must be)' $tmp.mkfserr; then > eval "$mkfs_cmd $extra_mkfs_options $SCRATCH_DEV" \ > 2>$tmp.mkfserr 1>$tmp.mkfsstd > mkfs_status=$? > @@ -126,6 +126,12 @@ _scratch_find_xfs_min_logblocks() > rm -f $tmp.mkfsstd $tmp.mkfserr > return > fi > + if grep -q 'external log device.*too small, must be' $tmp.mkfserr; then > + grep 'external log device.*too small, must be' $tmp.mkfserr | \ > + sed -e 's/^.*must be at least \([0-9]*\) blocks/\1/g' > + rm -f $tmp.mkfsstd $tmp.mkfserr > + return > + fi > > # Don't know what to do, so fail > echo "Cannot determine minimum log size" >&2 >
