diff options
| author | Keith Mannthey <kmannth@us.ibm.com> | 2011-11-29 17:44:12 -0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2012-02-15 16:40:22 +0100 |
| commit | 941b2ddf71987ef369389517a7e215dd505fe01e (patch) | |
| tree | c41936dbc4201d118cc145265d0343e3b93d46f6 /fs/btrfs | |
| parent | d98456fcafa6f3fd1985f9b7429aaa3531c6bfa0 (diff) | |
| download | linux-stable-941b2ddf71987ef369389517a7e215dd505fe01e.tar.gz linux-stable-941b2ddf71987ef369389517a7e215dd505fe01e.tar.bz2 linux-stable-941b2ddf71987ef369389517a7e215dd505fe01e.zip | |
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/btrfs')
| -rw-r--r-- | fs/btrfs/disk-io.c | 6 |
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, 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); |