Commit de94a2e1 authored by Zeng Heng's avatar Zeng Heng Committed by Dave Chinner
Browse files

xfs: simplify if-else condition in xfs_validate_new_dalign 



"else" is not generally useful after a return,
so remove them which makes if condition a bit
more clear.

There is no logical changes.

Signed-off-by: default avatarZeng Heng <zengheng4@huawei.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 92b40768

fs/xfs/xfs_mount.c

+20 −18
Original line number Diff line number Diff line
@@ -300,7 +300,8 @@ xfs_validate_new_dalign( 
	"alignment check failed: sunit/swidth vs. blocksize(%d)",

			mp->m_sb.sb_blocksize);

		return -EINVAL;

	} else {

	}



	/*

	 * Convert the stripe unit and width to FSBs.

	 */
@@ -310,15 +311,16 @@ xfs_validate_new_dalign( 
	"alignment check failed: sunit/swidth vs. agsize(%d)",

			mp->m_sb.sb_agblocks);

		return -EINVAL;

		} else if (mp->m_dalign) {

			mp->m_swidth = XFS_BB_TO_FSBT(mp, mp->m_swidth);

		} else {

	}



	if (!mp->m_dalign) {

		xfs_warn(mp,

	"alignment check failed: sunit(%d) less than bsize(%d)",

			mp->m_dalign, mp->m_sb.sb_blocksize);

		return -EINVAL;

	}

	}



	mp->m_swidth = XFS_BB_TO_FSBT(mp, mp->m_swidth);



	if (!xfs_has_dalign(mp)) {

		xfs_warn(mp,