diff options
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r-- | fs/btrfs/disk-io.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 54cca7a1572b..60ce1190307b 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -2806,7 +2806,7 @@ int open_ctree(struct super_block *sb, | |||
2806 | 2806 | ||
2807 | nodesize = btrfs_super_nodesize(disk_super); | 2807 | nodesize = btrfs_super_nodesize(disk_super); |
2808 | sectorsize = btrfs_super_sectorsize(disk_super); | 2808 | sectorsize = btrfs_super_sectorsize(disk_super); |
2809 | stripesize = btrfs_super_stripesize(disk_super); | 2809 | stripesize = sectorsize; |
2810 | fs_info->dirty_metadata_batch = nodesize * (1 + ilog2(nr_cpu_ids)); | 2810 | fs_info->dirty_metadata_batch = nodesize * (1 + ilog2(nr_cpu_ids)); |
2811 | fs_info->delalloc_batch = sectorsize * 512 * (1 + ilog2(nr_cpu_ids)); | 2811 | fs_info->delalloc_batch = sectorsize * 512 * (1 + ilog2(nr_cpu_ids)); |
2812 | 2812 | ||
@@ -4133,9 +4133,7 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info, | |||
4133 | btrfs_super_bytes_used(sb)); | 4133 | btrfs_super_bytes_used(sb)); |
4134 | ret = -EINVAL; | 4134 | ret = -EINVAL; |
4135 | } | 4135 | } |
4136 | if (!is_power_of_2(btrfs_super_stripesize(sb)) || | 4136 | if (!is_power_of_2(btrfs_super_stripesize(sb))) { |
4137 | ((btrfs_super_stripesize(sb) != sectorsize) && | ||
4138 | (btrfs_super_stripesize(sb) != 4096))) { | ||
4139 | btrfs_err(fs_info, "invalid stripesize %u", | 4137 | btrfs_err(fs_info, "invalid stripesize %u", |
4140 | btrfs_super_stripesize(sb)); | 4138 | btrfs_super_stripesize(sb)); |
4141 | ret = -EINVAL; | 4139 | ret = -EINVAL; |