aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorKeith Mannthey <kmannth@us.ibm.com>2011-11-29 20:44:12 -0500
committerDavid Sterba <dsterba@suse.cz>2012-02-15 10:40:22 -0500
commit941b2ddf71987ef369389517a7e215dd505fe01e (patch)
treec41936dbc4201d118cc145265d0343e3b93d46f6 /fs
parentd98456fcafa6f3fd1985f9b7429aaa3531c6bfa0 (diff)
btrfs: Sector Size check during Mount
Gracefully fail when trying to mount a BTRFS file system that has a sectorsize smaller than PAGE_SIZE. On PPC it is possible to build a FS while using a 4k PAGE_SIZE kernel then boot into a 64K PAGE_SIZE kernel. Presently open_ctree fails in an endless loop and hangs the machine in this situation. My debugging has show this Sector size < Page size to be a non trivial situation and a graceful exit from the situation would be nice for the time being. Signed-off-by: Keith Mannthey <kmannth@us.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/disk-io.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 4c867112b4c8..58d0678dfcba 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2258,6 +2258,12 @@ struct btrfs_root *open_ctree(struct super_block *sb,
2258 goto fail_sb_buffer; 2258 goto fail_sb_buffer;
2259 } 2259 }
2260 2260
2261 if (sectorsize < PAGE_SIZE) {
2262 printk(KERN_WARNING "btrfs: Incompatible sector size "
2263 "found on %s\n", sb->s_id);
2264 goto fail_sb_buffer;
2265 }
2266
2261 mutex_lock(&fs_info->chunk_mutex); 2267 mutex_lock(&fs_info->chunk_mutex);
2262 ret = btrfs_read_sys_array(tree_root); 2268 ret = btrfs_read_sys_array(tree_root);
2263 mutex_unlock(&fs_info->chunk_mutex); 2269 mutex_unlock(&fs_info->chunk_mutex);