All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Sterba <dsterba@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: David Sterba <dsterba@suse.com>
Subject: [PATCH v2 10/16] btrfs: remove wrong use of volume_mutex from btrfs_dev_replace_start
Date: Thu, 19 Apr 2018 18:33:32 +0200	[thread overview]
Message-ID: <680085048b4eb0a14981ab0e2a4f3b76665e0d02.1524146556.git.dsterba@suse.com> (raw)
In-Reply-To: <cover.1524146555.git.dsterba@suse.com>

The volume mutex does not protect against anything in this case, the
comment about scrub is right but not related to locking and looks
confusing. The comment in btrfs_find_device_missing_or_by_path is wrong
and confusing too.

The device_list_mutex is not held here to protect device lookup, but in
this case device replace cannot run in parallel with device removal (due
to exclusive op protection), so we don't need further locking here.

Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
---
 fs/btrfs/dev-replace.c | 7 +------
 fs/btrfs/volumes.c     | 4 ----
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 346bd460f8e7..ba011af9b0d2 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -426,18 +426,13 @@ int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
 	struct btrfs_device *tgt_device = NULL;
 	struct btrfs_device *src_device = NULL;
 
-	/* the disk copy procedure reuses the scrub code */
-	mutex_lock(&fs_info->volume_mutex);
 	ret = btrfs_find_device_by_devspec(fs_info, srcdevid,
 					    srcdev_name, &src_device);
-	if (ret) {
-		mutex_unlock(&fs_info->volume_mutex);
+	if (ret)
 		return ret;
-	}
 
 	ret = btrfs_init_dev_replace_tgtdev(fs_info, tgtdev_name,
 					    src_device, &tgt_device);
-	mutex_unlock(&fs_info->volume_mutex);
 	if (ret)
 		return ret;
 
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 3b8085b5655d..8a5b022e9cde 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2198,10 +2198,6 @@ int btrfs_find_device_missing_or_by_path(struct btrfs_fs_info *fs_info,
 		struct btrfs_device *tmp;
 
 		devices = &fs_info->fs_devices->devices;
-		/*
-		 * It is safe to read the devices since the volume_mutex
-		 * is held by the caller.
-		 */
 		list_for_each_entry(tmp, devices, dev_list) {
 			if (test_bit(BTRFS_DEV_STATE_IN_FS_METADATA,
 					&tmp->dev_state) && !tmp->bdev) {
-- 
2.16.2


  parent reply	other threads:[~2018-04-19 16:36 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-19 16:33 [PATCH v2 00/16] Kill fs_info::volume_mutex David Sterba
2018-04-19 16:33 ` [PATCH v2 01/16] btrfs: squeeze btrfs_dev_replace_continue_on_mount to its caller David Sterba
2018-04-19 16:33 ` [PATCH v2 02/16] btrfs: make success path out of btrfs_init_dev_replace_tgtdev more clear David Sterba
2018-04-19 16:33 ` [PATCH v2 03/16] btrfs: export and rename free_device David Sterba
2018-04-19 16:33 ` [PATCH v2 04/16] btrfs: move btrfs_init_dev_replace_tgtdev to dev-replace.c and make static David Sterba
2018-04-19 16:33 ` [PATCH v2 05/16] btrfs: move volume_mutex to callers of btrfs_rm_device David Sterba
2018-04-19 16:33 ` [PATCH v2 06/16] btrfs: move clearing of EXCL_OP out of __cancel_balance David Sterba
2018-04-20  7:02   ` Nikolay Borisov
2018-04-20  7:35   ` Anand Jain
2018-04-19 16:33 ` [PATCH v2 07/16] btrfs: add proper safety check before resuming dev-replace David Sterba
2018-04-20  7:04   ` Nikolay Borisov
2018-04-20  7:36   ` Anand Jain
2018-04-19 16:33 ` [PATCH v2 08/16] btrfs: add sanity check when resuming balance after mount David Sterba
2018-04-20  7:38   ` Anand Jain
2018-04-19 16:33 ` [PATCH v2 09/16] btrfs: cleanup helpers that reset balance state David Sterba
2018-04-20  7:07   ` Nikolay Borisov
2018-04-20 11:28     ` David Sterba
2018-04-20  9:04   ` Anand Jain
2018-04-19 16:33 ` David Sterba [this message]
2018-04-19 16:33 ` [PATCH v2 11/16] btrfs: kill btrfs_fs_info::volume_mutex David Sterba
2018-04-19 16:33 ` [PATCH v2 12/16] btrfs: track running balance in a simpler way David Sterba
2018-04-20  7:52   ` Anand Jain
2018-04-20 11:58     ` David Sterba
2018-04-20 12:19       ` David Sterba
2018-04-20 13:32         ` Anand Jain
2018-04-27  2:10   ` Anand Jain
2018-04-27 16:10     ` David Sterba
2018-04-19 16:33 ` [PATCH v2 13/16] btrfs: move and comment read-only check in btrfs_cancel_balance David Sterba
2018-04-20  9:13   ` Anand Jain
2018-04-20 11:59     ` David Sterba
2018-04-20 12:06     ` [PATCH v2.1 " David Sterba
2018-04-27  2:02       ` Anand Jain
2018-04-19 16:33 ` [PATCH v2 14/16] btrfs: drop lock parameter from update_ioctl_balance_args and rename David Sterba
2018-04-20  9:21   ` Anand Jain
2018-04-19 16:33 ` [PATCH v2 15/16] btrfs: use mutex in btrfs_resume_balance_async David Sterba
2018-04-20  9:25   ` Anand Jain
2018-04-19 16:33 ` [PATCH v2 16/16] btrfs: open code set_balance_control 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=680085048b4eb0a14981ab0e2a4f3b76665e0d02.1524146556.git.dsterba@suse.com \
    --to=dsterba@suse.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.