diff options
author | Li Zefan <lizf@cn.fujitsu.com> | 2011-11-28 03:43:00 -0500 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2011-11-30 12:46:05 -0500 |
commit | b772a86ea6d932ac29d5e50e67c977653c832f8a (patch) | |
tree | c142daf34c910b496ce578dfb391a8ebd929652e /fs/btrfs | |
parent | ece7d20e8be6730fbb29f4550de6b19b1a3a9387 (diff) |
Btrfs: fix oops when calling statfs on readonly device
To reproduce this bug:
# dd if=/dev/zero of=img bs=1M count=256
# mkfs.btrfs img
# losetup -r /dev/loop1 img
# mount /dev/loop1 /mnt
OOPS!!
It triggered BUG_ON(!nr_devices) in btrfs_calc_avail_data_space().
To fix this, instead of checking write-only devices, we check all open
deivces:
# df -h /dev/loop1
Filesystem Size Used Avail Use% Mounted on
/dev/loop1 250M 28K 238M 1% /mnt
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/super.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 8bd9d6d0e07a..1a3ce9e0b495 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
@@ -1083,7 +1083,7 @@ static int btrfs_calc_avail_data_space(struct btrfs_root *root, u64 *free_bytes) | |||
1083 | int i = 0, nr_devices; | 1083 | int i = 0, nr_devices; |
1084 | int ret; | 1084 | int ret; |
1085 | 1085 | ||
1086 | nr_devices = fs_info->fs_devices->rw_devices; | 1086 | nr_devices = fs_info->fs_devices->open_devices; |
1087 | BUG_ON(!nr_devices); | 1087 | BUG_ON(!nr_devices); |
1088 | 1088 | ||
1089 | devices_info = kmalloc(sizeof(*devices_info) * nr_devices, | 1089 | devices_info = kmalloc(sizeof(*devices_info) * nr_devices, |
@@ -1105,8 +1105,8 @@ static int btrfs_calc_avail_data_space(struct btrfs_root *root, u64 *free_bytes) | |||
1105 | else | 1105 | else |
1106 | min_stripe_size = BTRFS_STRIPE_LEN; | 1106 | min_stripe_size = BTRFS_STRIPE_LEN; |
1107 | 1107 | ||
1108 | list_for_each_entry(device, &fs_devices->alloc_list, dev_alloc_list) { | 1108 | list_for_each_entry(device, &fs_devices->devices, dev_list) { |
1109 | if (!device->in_fs_metadata) | 1109 | if (!device->in_fs_metadata || !device->bdev) |
1110 | continue; | 1110 | continue; |
1111 | 1111 | ||
1112 | avail_space = device->total_bytes - device->bytes_used; | 1112 | avail_space = device->total_bytes - device->bytes_used; |