diff options
| author | Miao Xie | 2014-09-03 15:35:40 +0200 |
|---|---|---|
| committer | Chris Mason | 2014-09-17 22:38:41 +0200 |
| commit | 15484377f597ca98ee84de87caa13667ea68bb14 (patch) | |
| tree | 70ccf2e4e260ec20e46e3b477865b71c22949f66 /fs/btrfs/super.c | |
| parent | Btrfs: fix unprotected system chunk array insertion (diff) | |
| download | kernel-qcow2-linux-15484377f597ca98ee84de87caa13667ea68bb14.tar.gz kernel-qcow2-linux-15484377f597ca98ee84de87caa13667ea68bb14.tar.xz kernel-qcow2-linux-15484377f597ca98ee84de87caa13667ea68bb14.zip | |
Btrfs: fix unprotected device list access when getting the fs information
When we get the fs information, we forgot to acquire the mutex of device list,
it might cause the problem we might access a device that was removed. Fix
it by acquiring the device list mutex.
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 3f1f4e2dc78f..2375f94fb780 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1696,7 +1696,11 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf) struct btrfs_block_rsv *block_rsv = &fs_info->global_block_rsv; int ret; - /* holding chunk_muext to avoid allocating new chunks */ + /* + * holding chunk_muext to avoid allocating new chunks, holding + * device_list_mutex to avoid the device being removed + */ + mutex_lock(&fs_info->fs_devices->device_list_mutex); mutex_lock(&fs_info->chunk_mutex); rcu_read_lock(); list_for_each_entry_rcu(found, head, list) { @@ -1737,11 +1741,13 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf) ret = btrfs_calc_avail_data_space(fs_info->tree_root, &total_free_data); if (ret) { mutex_unlock(&fs_info->chunk_mutex); + mutex_unlock(&fs_info->fs_devices->device_list_mutex); return ret; } buf->f_bavail += div_u64(total_free_data, factor); buf->f_bavail = buf->f_bavail >> bits; mutex_unlock(&fs_info->chunk_mutex); + mutex_unlock(&fs_info->fs_devices->device_list_mutex); buf->f_type = BTRFS_SUPER_MAGIC; buf->f_bsize = dentry->d_sb->s_blocksize; |