lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: fix the race between remove dev and alloc chunk

Browse Source 
On remove device path, it updates device->dev_alloc_list but does not hold
chunk lock

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Xiao Guangrong
2011-04-20 10:08:16 +00:00
committed by Chris Mason
parent c9513edb00
commit 0c1daee085
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/btrfs/volumes.c
View File

@@ -1291,7 +1291,9 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path)
} }
if (device->writeable) { if (device->writeable) {
lock_chunks(root);
list_del_init(&device->dev_alloc_list); list_del_init(&device->dev_alloc_list);
unlock_chunks(root);
root->fs_info->fs_devices->rw_devices--; root->fs_info->fs_devices->rw_devices--;
} }
@@ -1345,7 +1347,9 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path)
} }
fs_devices->seed = device->fs_devices->seed; fs_devices->seed = device->fs_devices->seed;
device->fs_devices->seed = NULL; device->fs_devices->seed = NULL;
lock_chunks(root);
__btrfs_close_devices(device->fs_devices); __btrfs_close_devices(device->fs_devices);
unlock_chunks(root);
free_fs_devices(device->fs_devices); free_fs_devices(device->fs_devices);
} }
@@ -1377,8 +1381,10 @@ out:
return ret; return ret;
error_undo: error_undo:
if (device->writeable) { if (device->writeable) {
lock_chunks(root);
list_add(&device->dev_alloc_list, list_add(&device->dev_alloc_list,
&root->fs_info->fs_devices->alloc_list); &root->fs_info->fs_devices->alloc_list);
unlock_chunks(root);
root->fs_info->fs_devices->rw_devices++; root->fs_info->fs_devices->rw_devices++;
} }
goto error_brelse; goto error_brelse;