From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: dsterba@suse.com, josef@toxicpanda.com, nborisov@suse.com
Subject: [PATCH 13/16] btrfs: cleanup btrfs_remove_chunk
Date: Sat, 5 Sep 2020 01:34:33 +0800 [thread overview]
Message-ID: <731ff89d22332c3e344f9ea4ca28012f01d50656.1599234146.git.anand.jain@oracle.com> (raw)
In-Reply-To: <cover.1599234146.git.anand.jain@oracle.com>
In the function btrfs_remove_chunk() remove the local variable
%fs_devices, instead use the assigned pointer directly.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
---
fs/btrfs/volumes.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index f70b79eaa76d..f16c4a854a6c 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2922,7 +2922,6 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)
struct map_lookup *map;
u64 dev_extent_len = 0;
int i, ret = 0;
- struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
em = btrfs_get_chunk_map(fs_info, chunk_offset, 1);
if (IS_ERR(em)) {
@@ -2944,14 +2943,14 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)
* a device replace operation that replaces the device object associated
* with map stripes (dev-replace.c:btrfs_dev_replace_finishing()).
*/
- mutex_lock(&fs_devices->device_list_mutex);
+ mutex_lock(&fs_info->fs_devices->device_list_mutex);
for (i = 0; i < map->num_stripes; i++) {
struct btrfs_device *device = map->stripes[i].dev;
ret = btrfs_free_dev_extent(trans, device,
map->stripes[i].physical,
&dev_extent_len);
if (ret) {
- mutex_unlock(&fs_devices->device_list_mutex);
+ mutex_unlock(&fs_info->fs_devices->device_list_mutex);
btrfs_abort_transaction(trans, ret);
goto out;
}
@@ -2967,12 +2966,12 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)
ret = btrfs_update_device(trans, device);
if (ret) {
- mutex_unlock(&fs_devices->device_list_mutex);
+ mutex_unlock(&fs_info->fs_devices->device_list_mutex);
btrfs_abort_transaction(trans, ret);
goto out;
}
}
- mutex_unlock(&fs_devices->device_list_mutex);
+ mutex_unlock(&fs_info->fs_devices->device_list_mutex);
ret = btrfs_free_chunk(trans, chunk_offset);
if (ret) {
--
2.25.1
next prev parent reply other threads:[~2020-09-04 18:10 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-04 17:34 [PATCH v3 0/16] btrfs: seed fix null ptr, use only main device_list_mutex, and cleanups Anand Jain
2020-09-04 17:34 ` [PATCH 01/16] btrfs: fix put of uninitialized kobject after seed device delete Anand Jain
2020-09-07 11:29 ` Johannes Thumshirn
2020-09-07 11:30 ` Johannes Thumshirn
2020-09-07 11:57 ` Anand Jain
2020-09-07 15:09 ` Johannes Thumshirn
2020-09-08 15:47 ` David Sterba
2020-09-08 15:55 ` David Sterba
2020-09-04 17:34 ` [PATCH 02/16] btrfs: fix replace of seed device Anand Jain
2020-09-04 17:34 ` [PATCH 03/16] btrfs: add btrfs_sysfs_add_device helper Anand Jain
2020-09-04 17:34 ` [PATCH 04/16] btrfs: add btrfs_sysfs_remove_device helper Anand Jain
2020-09-07 15:51 ` Johannes Thumshirn
2020-09-04 17:34 ` [PATCH 05/16] btrfs: btrfs_sysfs_remove_devices_dir drop return value Anand Jain
2020-09-04 17:34 ` [PATCH 06/16] btrfs: refactor btrfs_sysfs_add_devices_dir Anand Jain
2020-09-04 17:34 ` [PATCH 07/16] btrfs: refactor btrfs_sysfs_remove_devices_dir Anand Jain
2020-09-04 17:34 ` [PATCH 08/16] btrfs: initialize sysfs devid and device link for seed device Anand Jain
2020-09-04 17:34 ` [PATCH 09/16] btrfs: handle fail path for btrfs_sysfs_add_fs_devices Anand Jain
2020-09-04 17:34 ` [PATCH 10/16] btrfs: reada: use sprout device_list_mutex Anand Jain
2020-09-04 17:34 ` [PATCH 11/16] btrfs: btrfs_init_devices_late: " Anand Jain
2020-09-04 17:34 ` [PATCH 12/16] btrfs: open code list_head pointer in btrfs_init_dev_replace_tgtdev Anand Jain
2020-09-04 17:34 ` Anand Jain [this message]
2020-09-09 10:50 ` [PATCH 13/16] btrfs: cleanup btrfs_remove_chunk David Sterba
2020-09-09 11:15 ` Anand Jain
2020-09-04 17:34 ` [PATCH 14/16] btrfs: cleanup btrfs_assign_next_active_device() Anand Jain
2020-09-04 17:34 ` [PATCH 15/16] btrfs: cleanup unnecessary goto in open_seed_device Anand Jain
2020-09-04 17:34 ` [PATCH 16/16] btrfs: btrfs_dev_replace_update_device_in_mapping_tree drop file global declare Anand Jain
2020-09-04 23:25 ` [PATCH v2 0/2] fstests: btrfs seed device device operation tests Anand Jain
2020-09-04 23:25 ` [PATCH v2 1/2] btrfs: add a test case for btrfs seed device delete Anand Jain
2020-10-15 15:45 ` Filipe Manana
2020-10-20 11:21 ` Anand Jain
2020-09-04 23:25 ` [PATCH 2/2] btrfs/163: replace sprout instead of seed Anand Jain
2020-10-15 15:49 ` Filipe Manana
2020-10-20 12:20 ` Anand Jain
2020-09-09 13:14 ` [PATCH v3 0/16] btrfs: seed fix null ptr, use only main device_list_mutex, and cleanups 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=731ff89d22332c3e344f9ea4ca28012f01d50656.1599234146.git.anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=nborisov@suse.com \
/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.