Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2edbddd5 authored by Lachlan McIlroy's avatar Lachlan McIlroy Committed by Niv Sardi
Browse files

[XFS] Don't assert if trying to mount with blocksize > pagesize 



If we don't do the blocksize/PAGESIZE check before calling
xfs_sb_validate_fsb_count() we can assert if we try to mount with a
blocksize > pagesize. The assert is valid so leave it and just move the
blocksize/pagesize check earlier.

SGI-PV: 983734

SGI-Modid: xfs-linux-melb:xfs-kern:31365a

Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
parent 8f8670bb

fs/xfs/xfs_mount.c

+13 −13
Original line number Diff line number Diff line
@@ -258,6 +258,19 @@ xfs_mount_validate_sb( 
		return XFS_ERROR(EFSCORRUPTED);

	}



	/*

	 * Until this is fixed only page-sized or smaller data blocks work.

	 */

	if (unlikely(sbp->sb_blocksize > PAGE_SIZE)) {

		xfs_fs_mount_cmn_err(flags,

			"file system with blocksize %d bytes",

			sbp->sb_blocksize);

		xfs_fs_mount_cmn_err(flags,

			"only pagesize (%ld) or less will currently work.",

			PAGE_SIZE);

		return XFS_ERROR(ENOSYS);

	}



	if (xfs_sb_validate_fsb_count(sbp, sbp->sb_dblocks) ||

	    xfs_sb_validate_fsb_count(sbp, sbp->sb_rblocks)) {

		xfs_fs_mount_cmn_err(flags,
@@ -279,19 +292,6 @@ xfs_mount_validate_sb( 
		return XFS_ERROR(ENOSYS);

	}



	/*

	 * Until this is fixed only page-sized or smaller data blocks work.

	 */

	if (unlikely(sbp->sb_blocksize > PAGE_SIZE)) {

		xfs_fs_mount_cmn_err(flags,

			"file system with blocksize %d bytes",

			sbp->sb_blocksize);

		xfs_fs_mount_cmn_err(flags,

			"only pagesize (%ld) or less will currently work.",

			PAGE_SIZE);

		return XFS_ERROR(ENOSYS);

	}



	return 0;

}