]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Btrfs: fix oops when calling statfs on readonly device
authorLi Zefan <lizf@cn.fujitsu.com>
Mon, 28 Nov 2011 08:43:00 +0000 (16:43 +0800)
committerChris Mason <chris.mason@oracle.com>
Fri, 16 Dec 2011 19:40:56 +0000 (14:40 -0500)
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>
(cherry picked from commit b772a86ea6d932ac29d5e50e67c977653c832f8a)

fs/btrfs/super.c

index 16482dc76a4e53ebcc63327c98eb52da68ddb535..49d51ef0d522d161d9a42be2b8223aa4a2cf42dc 100644 (file)
@@ -1095,7 +1095,7 @@ static int btrfs_calc_avail_data_space(struct btrfs_root *root, u64 *free_bytes)
        int i = 0, nr_devices;
        int ret;
 
-       nr_devices = fs_info->fs_devices->rw_devices;
+       nr_devices = fs_info->fs_devices->open_devices;
        BUG_ON(!nr_devices);
 
        devices_info = kmalloc(sizeof(*devices_info) * nr_devices,
@@ -1117,8 +1117,8 @@ static int btrfs_calc_avail_data_space(struct btrfs_root *root, u64 *free_bytes)
        else
                min_stripe_size = BTRFS_STRIPE_LEN;
 
-       list_for_each_entry(device, &fs_devices->alloc_list, dev_alloc_list) {
-               if (!device->in_fs_metadata)
+       list_for_each_entry(device, &fs_devices->devices, dev_list) {
+               if (!device->in_fs_metadata || !device->bdev)
                        continue;
 
                avail_space = device->total_bytes - device->bytes_used;