From 4fc8f40f357eb8ad0e137f2e59570fc306771046 Mon Sep 17 00:00:00 2001
From: Lachlan McIlroy <lachlan@sgi.com>
Date: Fri, 27 Jun 2008 13:34:34 +1000
Subject: [PATCH] --- yaml --- r: 107455 b: refs/heads/master c:
 2edbddd5f46cc123b68c11179115041c54759fa2 h: refs/heads/master i:   107453:
 f18a1ee5ca4bfbd87d2b77a46e68c687079d4bd4   107451:
 1df608fbb4c777bcf6f91c494a36c0181ac56e42   107447:
 0fbd39540ec39656daa863d7bf63c686bddd45c2   107439:
 62b14881f79be5594523e7d809b1be800996c3e4   107423:
 2c7100966461dec163e6b5a072392074aeef6947   107391:
 0b59a8025d40456caf66604b472b50b1b9d0dc86 v: v3

---
 [refs]                   |  2 +-
 trunk/fs/xfs/xfs_mount.c | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 21d1e122d0e4..9bedd75c34f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f8670bb1cfa177d35c54e4cc96152dc425a7ab3
+refs/heads/master: 2edbddd5f46cc123b68c11179115041c54759fa2
diff --git a/trunk/fs/xfs/xfs_mount.c b/trunk/fs/xfs/xfs_mount.c
index 1bfaa204f689..6c5d1325e7f6 100644
--- a/trunk/fs/xfs/xfs_mount.c
+++ b/trunk/fs/xfs/xfs_mount.c
@@ -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;
 }