linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 5/7] btrfs: btrfs_rm_device() does not need uuid_mutex
Date: Mon,  6 Nov 2017 16:36:16 +0800	[thread overview]
Message-ID: <20171106083618.7617-6-anand.jain@oracle.com> (raw)
In-Reply-To: <20171106083618.7617-1-anand.jain@oracle.com>

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

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 2329f429ce40..3d5ed4518f20 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1914,7 +1914,6 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path,
 	int ret = 0;
 
 	mutex_lock(&fs_info->volume_mutex);
-	mutex_lock(&uuid_mutex);
 
 	num_devices = fs_info->fs_devices->num_devices;
 	btrfs_dev_replace_lock(&fs_info->dev_replace, 0);
@@ -1950,9 +1949,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path,
 		mutex_unlock(&fs_info->chunk_mutex);
 	}
 
-	mutex_unlock(&uuid_mutex);
 	ret = btrfs_shrink_device(device, 0);
-	mutex_lock(&uuid_mutex);
 	if (ret)
 		goto error_undo;
 
@@ -2027,7 +2024,6 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path,
 	}
 
 out:
-	mutex_unlock(&uuid_mutex);
 	mutex_unlock(&fs_info->volume_mutex);
 	return ret;
 
-- 
2.13.1


  parent reply	other threads:[~2017-11-06  8:36 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-06  8:36 [PATCH 0/8] Misc device cleanup patches: part1 Anand Jain
2017-11-06  8:36 ` [PATCH 1/7] btrfs: optimize use of volume_mutex in btrfs_ioctl_resize() Anand Jain
2017-11-06 16:50   ` David Sterba
2017-11-06  8:36 ` [PATCH 2/7] btrfs: move user provided string checks outside of volume_mutex Anand Jain
2017-11-06  8:36 ` [PATCH 3/7] btrfs: use i_size_read() instead of open code Anand Jain
2017-11-06 16:52   ` David Sterba
2017-11-06 23:44     ` Anand Jain
2017-11-15 16:45       ` David Sterba
2017-11-06  8:36 ` [PATCH 4/7] btrfs: rename btrfs_add_device to btrfs_add_dev_item Anand Jain
2017-11-06 16:53   ` David Sterba
2017-11-06  8:36 ` Anand Jain [this message]
2017-11-06 17:02   ` [PATCH 5/7] btrfs: btrfs_rm_device() does not need uuid_mutex David Sterba
2017-11-06 23:59     ` Anand Jain
2017-11-06  8:36 ` [PATCH 6/7] btrfs: move volume_mutex into btrfs_init_new_device() Anand Jain
2017-11-06  8:36 ` [PATCH 7/7] btrfs: rename btrfs_init_new_device() to btrfs_add_device() Anand Jain

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=20171106083618.7617-6-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;
as well as URLs for NNTP newsgroup(s).