From d9f61e15fc46ab821c2a927738e56b6a6de38a05 Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Fri, 27 May 2011 10:03:58 -0400 Subject: [PATCH] --- yaml --- r: 252347 b: refs/heads/master c: 174ba50915b08dcfd07c8b5fb795b46a165fa09a h: refs/heads/master i: 252345: 9cce53226609180a328257867c8eb721eccbf2a9 252343: dc216b4057186e97f9a880fdd0b490a5503b4fde v: v3 --- [refs] | 2 +- trunk/fs/btrfs/disk-io.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0612a5cc4e80..023e468548d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a47d6b70e280401d553e7cac6f5750870de1ad21 +refs/heads/master: 174ba50915b08dcfd07c8b5fb795b46a165fa09a diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c index b2588a552658..98b6a71decba 100644 --- a/trunk/fs/btrfs/disk-io.c +++ b/trunk/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; 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; list_for_each_entry_rcu(dev, head, dev_list) { if (!dev->bdev) { @@ -2355,7 +2355,7 @@ int write_all_supers(struct btrfs_root *root, int max_mirrors) if (ret) total_errors++; } - rcu_read_unlock(); + mutex_unlock(&root->fs_info->fs_devices->device_list_mutex); if (total_errors > max_errors) { printk(KERN_ERR "btrfs: %d errors while writing supers\n", total_errors);