Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Btrfs: fix oops when calling statfs on readonly device

Browse Source 
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>
This commit is contained in:
Li Zefan 2011-11-28 16:43:00 +08:00 committed by David Sterba
parent ece7d20e8b
commit b772a86ea6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/btrfs/super.c
View File

@ -1083,7 +1083,7 @@ static int btrfs_calc_avail_data_space(struct btrfs_root *root, u64 *free_bytes)
int i = 0, nr_devices; int i = 0, nr_devices;
int ret; int ret;
nr_devices = fs_info->fs_devices->rw_devices; nr_devices = fs_info->fs_devices->open_devices;
BUG_ON(!nr_devices); BUG_ON(!nr_devices);
devices_info = kmalloc(sizeof(*devices_info) * nr_devices, 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)
else else
min_stripe_size = BTRFS_STRIPE_LEN; min_stripe_size = BTRFS_STRIPE_LEN;
list_for_each_entry(device, &fs_devices->alloc_list, dev_alloc_list) { list_for_each_entry(device, &fs_devices->devices, dev_list) {
if (!device->in_fs_metadata) if (!device->in_fs_metadata || !device->bdev)
continue; continue;
avail_space = device->total_bytes - device->bytes_used; avail_space = device->total_bytes - device->bytes_used;