projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Btrfs: Add locking around volume management (device add/remove/balance)
[deliverable/linux.git]
/
fs
/
btrfs
/
ioctl.c
diff --git
a/fs/btrfs/ioctl.c
b/fs/btrfs/ioctl.c
index 026039a2ac580dac8126ab3e11e4a0dc973eceb4..83f17a5cbd6a23e67e34c6b1d1da7a7f4a1595e2 100644
(file)
--- a/
fs/btrfs/ioctl.c
+++ b/
fs/btrfs/ioctl.c
@@
-307,8
+307,7
@@
static int btrfs_ioctl_resize(struct btrfs_root *root, void __user *arg)
goto out;
}
goto out;
}
- mutex_lock(&root->fs_info->alloc_mutex);
- mutex_lock(&root->fs_info->chunk_mutex);
+ mutex_lock(&root->fs_info->volume_mutex);
sizestr = vol_args->name;
devstr = strchr(sizestr, ':');
if (devstr) {
sizestr = vol_args->name;
devstr = strchr(sizestr, ':');
if (devstr) {
@@
-378,8
+377,7
@@
static int btrfs_ioctl_resize(struct btrfs_root *root, void __user *arg)
}
out_unlock:
}
out_unlock:
- mutex_lock(&root->fs_info->alloc_mutex);
- mutex_lock(&root->fs_info->chunk_mutex);
+ mutex_unlock(&root->fs_info->volume_mutex);
out:
kfree(vol_args);
return ret;
out:
kfree(vol_args);
return ret;
This page took
0.023616 seconds
and
5
git commands to generate.