Move the XFS RT specific code into the file system type switch statement. Signed-off-by: Christoph Hellwig <hch@xxxxxx> --- common/rc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/common/rc b/common/rc index 1b2e4508d767..906905daa92d 100644 --- a/common/rc +++ b/common/rc @@ -1152,7 +1152,6 @@ _try_scratch_mkfs_sized() shift local def_blksz local blocksize_opt - local rt_ops case $FSTYP in xfs) @@ -1202,14 +1201,18 @@ _try_scratch_mkfs_sized() [ "$fssize" -gt "$devsize" ] && _notrun "Scratch device too small" fi - if [ "$FSTYP" = "xfs" ] && [ -b "$SCRATCH_RTDEV" ]; then - local rtdevsize=`blockdev --getsize64 $SCRATCH_RTDEV` - [ "$fssize" -gt "$rtdevsize" ] && _notrun "Scratch rt device too small" - rt_ops="-r size=$fssize" - fi - case $FSTYP in xfs) + local rt_ops + + if [ -b "$SCRATCH_RTDEV" ]; then + local rtdevsize=`blockdev --getsize64 $SCRATCH_RTDEV` + if [ "$fssize" -gt "$rtdevsize" ]; then + _notrun "Scratch rt device too small" + fi + rt_ops="-r size=$fssize" + fi + # don't override MKFS_OPTIONS that set a block size. echo $MKFS_OPTIONS |grep -E -q "b\s*size=" if [ $? -eq 0 ]; then -- 2.45.2
