Преглед изворни кода

Btrfs: use the device_list_mutex during write_dev_supers

write_dev_supers was changed to use RCU to protect the list of
devices, but it was then sleeping while it actually wrote the supers.
This fixes it to just use the mutex, since we really don't any
concurrency in write_dev_supers anyway.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
Chris Mason пре 14 година
родитељ
комит
174ba50915
1 измењених фајлова са 2 додато и 2 уклоњено
  1. 2 2
      fs/btrfs/disk-io.c

+ 2 - 2
fs/btrfs/disk-io.c

@@ -2310,7 +2310,7 @@ int write_all_supers(struct btrfs_root *root, int max_mirrors)
 	sb = &root->fs_info->super_for_commit;
 	sb = &root->fs_info->super_for_commit;
 	dev_item = &sb->dev_item;
 	dev_item = &sb->dev_item;
 
 
-	rcu_read_lock();
+	mutex_lock(&root->fs_info->fs_devices->device_list_mutex);
 	head = &root->fs_info->fs_devices->devices;
 	head = &root->fs_info->fs_devices->devices;
 	list_for_each_entry_rcu(dev, head, dev_list) {
 	list_for_each_entry_rcu(dev, head, dev_list) {
 		if (!dev->bdev) {
 		if (!dev->bdev) {
@@ -2355,7 +2355,7 @@ int write_all_supers(struct btrfs_root *root, int max_mirrors)
 		if (ret)
 		if (ret)
 			total_errors++;
 			total_errors++;
 	}
 	}
-	rcu_read_unlock();
+	mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);
 	if (total_errors > max_errors) {
 	if (total_errors > max_errors) {
 		printk(KERN_ERR "btrfs: %d errors while writing supers\n",
 		printk(KERN_ERR "btrfs: %d errors while writing supers\n",
 		       total_errors);
 		       total_errors);