From aa0c324cbf52aa2ea08b6896b57256b1f999fa87 Mon Sep 17 00:00:00 2001
From: Keith Mannthey <kmannth@us.ibm.com>
Date: Tue, 29 Nov 2011 17:44:12 -0800
Subject: [PATCH] --- yaml --- r: 287882 b: refs/heads/master c:
 941b2ddf71987ef369389517a7e215dd505fe01e h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/btrfs/disk-io.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6022a2b4f399..acdd10673a94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d98456fcafa6f3fd1985f9b7429aaa3531c6bfa0
+refs/heads/master: 941b2ddf71987ef369389517a7e215dd505fe01e
diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c
index 4c867112b4c8..58d0678dfcba 100644
--- a/trunk/fs/btrfs/disk-io.c
+++ b/trunk/fs/btrfs/disk-io.c
@@ -2258,6 +2258,12 @@ struct btrfs_root *open_ctree(struct super_block *sb,
 		goto fail_sb_buffer;
 	}
 
+	if (sectorsize < PAGE_SIZE) {
+		printk(KERN_WARNING "btrfs: Incompatible sector size "
+		       "found on %s\n", sb->s_id);
+		goto fail_sb_buffer;
+	}
+
 	mutex_lock(&fs_info->chunk_mutex);
 	ret = btrfs_read_sys_array(tree_root);
 	mutex_unlock(&fs_info->chunk_mutex);