Linux Btrfs filesystem development
 help / color / mirror / Atom feed
From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 1/7] btrfs: reada: use sprout device_list_mutex
Date: Fri, 14 Aug 2020 08:03:46 +0800	[thread overview]
Message-ID: <20200814000352.124179-2-anand.jain@oracle.com> (raw)
In-Reply-To: <20200814000352.124179-1-anand.jain@oracle.com>

On an fs mounted using a sprout-device, the seed fs_devices are maintained
in a linked list under fs_info->fs_devices. Each seed's fs_devices also
have device_list_mutex initialized to protect against the potential race
with delete threads. But the delete thread (at btrfs_rm_device()) is holding
the fs_info::fs_devices::device_list_mutex mutex which is sprout's
device_list_mutex instead of seed's device_list_mutex. Moreover, there
aren't any significient benefits in using the seed::device_list_mutex
instead of sprout::device_list_mutex.

So this patch converts them of using the seed::device_list_mutex to
sprout::device_list_mutex.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 fs/btrfs/reada.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/btrfs/reada.c b/fs/btrfs/reada.c
index 243a2e44526e..c4667410b3fa 100644
--- a/fs/btrfs/reada.c
+++ b/fs/btrfs/reada.c
@@ -775,22 +775,22 @@ static void __reada_start_machine(struct btrfs_fs_info *fs_info)
 	u64 total = 0;
 	int i;
 
+	mutex_lock(&fs_info->fs_devices->device_list_mutex);
 again:
 	do {
 		enqueued = 0;
-		mutex_lock(&fs_devices->device_list_mutex);
 		list_for_each_entry(device, &fs_devices->devices, dev_list) {
 			if (atomic_read(&device->reada_in_flight) <
 			    MAX_IN_FLIGHT)
 				enqueued += reada_start_machine_dev(device);
 		}
-		mutex_unlock(&fs_devices->device_list_mutex);
 		total += enqueued;
 	} while (enqueued && total < 10000);
 	if (fs_devices->seed) {
 		fs_devices = fs_devices->seed;
 		goto again;
 	}
+	mutex_unlock(&fs_info->fs_devices->device_list_mutex);
 
 	if (enqueued == 0)
 		return;
-- 
2.18.2


  reply	other threads:[~2020-08-14  0:04 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-14  0:03 [PATCH 0/7] btrfs: consolidate seed mutex to sprout mutex Anand Jain
2020-08-14  0:03 ` Anand Jain [this message]
2020-08-14  0:03 ` [PATCH 2/7] btrfs: btrfs_init_devices_late: use sprout device_list_mutex Anand Jain
2020-08-14  0:03 ` [PATCH 3/7] btrfs: open code list_head pointer in btrfs_init_dev_replace_tgtdev Anand Jain
2020-08-14  0:03 ` [PATCH 4/7] btrfs: cleanup unused return in btrfs_close_devices Anand Jain
2020-08-14  8:53   ` Nikolay Borisov
2020-08-14  0:03 ` [PATCH 5/7] btrfs: cleanup btrfs_assign_next_active_device() Anand Jain
2020-08-14  0:03 ` [PATCH 6/7] btrfs: cleanup unnecessary goto in open_seed_device Anand Jain
2020-08-14  0:03 ` [PATCH 7/7] btrfs: btrfs_dev_replace_update_device_in_mapping_tree drop file global declare Anand Jain
2020-08-24 16:48 ` [PATCH 0/7] btrfs: consolidate seed mutex to sprout mutex David Sterba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200814000352.124179-2-anand.jain@oracle.com \
    --to=anand.jain@oracle.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox