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 07/16] btrfs: refactor btrfs_sysfs_remove_devices_dir
Date: Sat, 5 Sep 2020 01:34:27 +0800 [thread overview]
Message-ID: <2999426cdd9713f6871b99598899fa69f4819725.1599234146.git.anand.jain@oracle.com> (raw)
In-Reply-To: <cover.1599234146.git.anand.jain@oracle.com>
Similar to btrfs_sysfs_add_devices_dir()'s refactor, refactor
btrfs_sysfs_remove_devices_dir() so that we don't have to use the 2nd
argument to indicate whether to free all devices or just one device.
Make btrfs_sysfs_remove_device() global as device operations outside of
sysfs.c now calls this instead of btrfs_sysfs_remove_devices_dir().
btrfs_sysfs_remove_devices_dir() is renamed to
btrfs_sysfs_remove_fs_devices() to suite its new role.
Now, no one outside of sysfs.c calls btrfs_sysfs_remove_fs_devices()
so it is redeclared as static. And the same function had to be moved
before its first caller.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
---
fs/btrfs/dev-replace.c | 2 +-
fs/btrfs/sysfs.c | 27 +++++++++++----------------
fs/btrfs/sysfs.h | 3 +--
fs/btrfs/volumes.c | 8 ++++----
4 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 2e54b8f4d053..70b4385a327c 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -743,7 +743,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
mutex_unlock(&fs_info->fs_devices->device_list_mutex);
/* replace the sysfs entry */
- btrfs_sysfs_remove_devices_dir(fs_info->fs_devices, src_device);
+ btrfs_sysfs_remove_device(src_device);
btrfs_sysfs_update_devid(tgt_device);
if (test_bit(BTRFS_DEV_STATE_WRITEABLE, &src_device->dev_state))
btrfs_scratch_superblocks(fs_info, src_device->bdev,
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 1da1c3ba2143..c5b8870b12bf 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -935,6 +935,14 @@ void btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs)
}
}
+void btrfs_sysfs_remove_fs_devices(struct btrfs_fs_devices *fs_devices)
+{
+ struct btrfs_device *device;
+
+ list_for_each_entry(device, &fs_devices->devices, dev_list)
+ btrfs_sysfs_remove_device(device);
+}
+
void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info)
{
struct kobject *fsid_kobj = &fs_info->fs_devices->fsid_kobj;
@@ -962,7 +970,7 @@ void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info)
addrm_unknown_feature_attrs(fs_info, false);
sysfs_remove_group(fsid_kobj, &btrfs_feature_attr_group);
sysfs_remove_files(fsid_kobj, btrfs_attrs);
- btrfs_sysfs_remove_devices_dir(fs_info->fs_devices, NULL);
+ btrfs_sysfs_remove_fs_devices(fs_info->fs_devices);
}
static const char * const btrfs_feature_set_names[FEAT_MAX] = {
@@ -1149,7 +1157,7 @@ int btrfs_sysfs_add_space_info_type(struct btrfs_fs_info *fs_info,
return 0;
}
-static void btrfs_sysfs_remove_device(struct btrfs_device *device)
+void btrfs_sysfs_remove_device(struct btrfs_device *device)
{
struct hd_struct *disk;
struct kobject *disk_kobj;
@@ -1175,19 +1183,6 @@ static void btrfs_sysfs_remove_device(struct btrfs_device *device)
}
}
-/* when 2nd argument device is NULL, it removes all devices link */
-void btrfs_sysfs_remove_devices_dir(struct btrfs_fs_devices *fs_devices,
- struct btrfs_device *one_device)
-{
- if (one_device) {
- btrfs_sysfs_remove_device(one_device);
- return;
- }
-
- list_for_each_entry(one_device, &fs_devices->devices, dev_list)
- btrfs_sysfs_remove_device(one_device);
-}
-
static ssize_t btrfs_devinfo_in_fs_metadata_show(struct kobject *kobj,
struct kobj_attribute *a,
char *buf)
@@ -1423,7 +1418,7 @@ int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info)
error = sysfs_create_files(fsid_kobj, btrfs_attrs);
if (error) {
- btrfs_sysfs_remove_devices_dir(fs_devs, NULL);
+ btrfs_sysfs_remove_fs_devices(fs_devs);
return error;
}
diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h
index 56c29257b5a7..bacef43f7267 100644
--- a/fs/btrfs/sysfs.h
+++ b/fs/btrfs/sysfs.h
@@ -15,8 +15,7 @@ enum btrfs_feature_set {
char *btrfs_printable_features(enum btrfs_feature_set set, u64 flags);
const char *btrfs_feature_set_name(enum btrfs_feature_set set);
int btrfs_sysfs_add_device(struct btrfs_device *device);
-void btrfs_sysfs_remove_devices_dir(struct btrfs_fs_devices *fs_devices,
- struct btrfs_device *one_device);
+void btrfs_sysfs_remove_device(struct btrfs_device *device);
int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs);
void btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs);
void btrfs_sysfs_update_sprout_fsid(struct btrfs_fs_devices *fs_devices);
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index f858c4d9a6ae..afdde29bce34 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2039,7 +2039,7 @@ void btrfs_scratch_superblocks(struct btrfs_fs_info *fs_info,
}
int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path,
- u64 devid)
+ u64 devid)
{
struct btrfs_device *device;
struct btrfs_fs_devices *cur_devices;
@@ -2143,7 +2143,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path,
if (device->bdev) {
cur_devices->open_devices--;
/* remove sysfs entry */
- btrfs_sysfs_remove_devices_dir(fs_devices, device);
+ btrfs_sysfs_remove_device(device);
}
num_devices = btrfs_super_num_devices(fs_info->super_copy) - 1;
@@ -2244,7 +2244,7 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_device *tgtdev)
mutex_lock(&fs_devices->device_list_mutex);
- btrfs_sysfs_remove_devices_dir(fs_devices, tgtdev);
+ btrfs_sysfs_remove_device(tgtdev);
if (tgtdev->bdev)
fs_devices->open_devices--;
@@ -2680,7 +2680,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path
return ret;
error_sysfs:
- btrfs_sysfs_remove_devices_dir(fs_devices, device);
+ btrfs_sysfs_remove_device(device);
mutex_lock(&fs_info->fs_devices->device_list_mutex);
mutex_lock(&fs_info->chunk_mutex);
list_del_rcu(&device->dev_list);
--
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 ` Anand Jain [this message]
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 ` [PATCH 13/16] btrfs: cleanup btrfs_remove_chunk Anand Jain
2020-09-09 10:50 ` 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=2999426cdd9713f6871b99598899fa69f4819725.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 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).