From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 04/15] btrfs: refactor btrfs_sysfs_add_devices_dir
Date: Thu, 3 Sep 2020 08:57:40 +0800 [thread overview]
Message-ID: <7f81bf1c3e80e7b558d17c1caf049e0c431033ab.1599091832.git.anand.jain@oracle.com> (raw)
In-Reply-To: <cover.1599091832.git.anand.jain@oracle.com>
When we add device we need to add a device to the sysfs, so instead of
using the btrfs_sysfs_add_devices_dir() 2nd argument to specify whether
to add a device or all of fs_devices, call the helper function directly
btrfs_sysfs_add_device() and thus make it non static.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/dev-replace.c | 2 +-
fs/btrfs/sysfs.c | 15 ++++++---------
fs/btrfs/sysfs.h | 3 +--
fs/btrfs/volumes.c | 2 +-
4 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 580e60fe07d0..979b40754cb4 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -512,7 +512,7 @@ static int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
atomic64_set(&dev_replace->num_uncorrectable_read_errors, 0);
up_write(&dev_replace->rwsem);
- ret = btrfs_sysfs_add_devices_dir(tgt_device->fs_devices, tgt_device);
+ ret = btrfs_sysfs_add_device(tgt_device);
if (ret)
btrfs_err(fs_info, "kobj add dev failed %d", ret);
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 7448caf12c53..69a58666f351 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -1265,7 +1265,7 @@ static struct kobj_type devid_ktype = {
.release = btrfs_release_devid_kobj,
};
-static int btrfs_sysfs_add_device(struct btrfs_device *device)
+int btrfs_sysfs_add_device(struct btrfs_device *device)
{
int ret;
unsigned int nofs_flag;
@@ -1315,16 +1315,13 @@ static int btrfs_sysfs_add_device(struct btrfs_device *device)
return ret;
}
-int btrfs_sysfs_add_devices_dir(struct btrfs_fs_devices *fs_devices,
- struct btrfs_device *one_device)
+int btrfs_sysfs_add_fs_devices(struct btrfs_fs_devices *fs_devices)
{
int ret;
+ struct btrfs_device *device;
- if (one_device)
- return btrfs_sysfs_add_device(one_device);
-
- list_for_each_entry(one_device, &fs_devices->devices, dev_list) {
- ret = btrfs_sysfs_add_device(one_device);
+ list_for_each_entry(device, &fs_devices->devices, dev_list) {
+ ret = btrfs_sysfs_add_device(device);
if (ret)
return ret;
}
@@ -1419,7 +1416,7 @@ int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info)
struct btrfs_fs_devices *fs_devs = fs_info->fs_devices;
struct kobject *fsid_kobj = &fs_devs->fsid_kobj;
- error = btrfs_sysfs_add_devices_dir(fs_devs, NULL);
+ error = btrfs_sysfs_add_fs_devices(fs_devs);
if (error)
return error;
diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h
index bc995b0c1889..56c29257b5a7 100644
--- a/fs/btrfs/sysfs.h
+++ b/fs/btrfs/sysfs.h
@@ -14,8 +14,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_devices_dir(struct btrfs_fs_devices *fs_devices,
- struct btrfs_device *one_device);
+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);
int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs);
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 3f8bd1af29eb..8952f7031f4b 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2599,7 +2599,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path
orig_super_num_devices + 1);
/* add sysfs device entry */
- btrfs_sysfs_add_devices_dir(fs_devices, device);
+ btrfs_sysfs_add_device(device);
/*
* we've got more storage, clear any full flags on the space
--
2.25.1
next prev parent reply other threads:[~2020-09-03 0:58 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 0:57 [PATCH v2 0/15] btrfs: seed fix null ptr, use only main device_list_mutex, and cleanups Anand Jain
2020-09-03 0:57 ` [PATCH 01/15] btrfs: add btrfs_sysfs_add_device helper Anand Jain
2020-09-03 8:40 ` Nikolay Borisov
2020-09-03 9:36 ` Anand Jain
2020-09-03 10:14 ` Anand Jain
2020-09-03 0:57 ` [PATCH 02/15] btrfs: add btrfs_sysfs_remove_device helper Anand Jain
2020-09-03 8:44 ` Nikolay Borisov
2020-09-03 10:03 ` Anand Jain
2020-09-03 10:09 ` Nikolay Borisov
2020-09-03 15:43 ` Josef Bacik
2020-09-03 0:57 ` [PATCH 03/15] btrfs: btrfs_sysfs_remove_devices_dir drop return value Anand Jain
2020-09-03 8:42 ` Nikolay Borisov
2020-09-03 15:44 ` Josef Bacik
2020-09-03 0:57 ` Anand Jain [this message]
2020-09-03 8:45 ` [PATCH 04/15] btrfs: refactor btrfs_sysfs_add_devices_dir Nikolay Borisov
2020-09-03 15:44 ` Josef Bacik
2020-09-03 0:57 ` [PATCH 05/15] btrfs: refactor btrfs_sysfs_remove_devices_dir Anand Jain
2020-09-03 8:47 ` Nikolay Borisov
2020-09-03 0:57 ` [PATCH 06/15] btrfs: initialize sysfs devid and device link for seed device Anand Jain
2020-09-03 9:06 ` Nikolay Borisov
2020-09-03 11:35 ` Anand Jain
2020-09-04 11:28 ` David Sterba
2020-09-03 0:57 ` [PATCH 07/15] btrfs: handle fail path for btrfs_sysfs_add_fs_devices Anand Jain
2020-09-03 9:13 ` Nikolay Borisov
2020-09-04 9:24 ` [PATCH v3 " Anand Jain
2020-09-03 0:57 ` [PATCH 08/15] btrfs: reada: use sprout device_list_mutex Anand Jain
2020-09-03 0:57 ` [PATCH 09/15] btrfs: btrfs_init_devices_late: " Anand Jain
2020-09-03 0:57 ` [PATCH 10/15] btrfs: open code list_head pointer in btrfs_init_dev_replace_tgtdev Anand Jain
2020-09-03 0:57 ` [PATCH 11/15] btrfs: cleanup btrfs_remove_chunk Anand Jain
2020-09-03 0:57 ` [PATCH 12/15] btrfs: cleanup btrfs_assign_next_active_device() Anand Jain
2020-09-03 0:57 ` [PATCH 13/15] btrfs: cleanup unnecessary goto in open_seed_device Anand Jain
2020-09-03 0:57 ` [PATCH 14/15] btrfs: btrfs_dev_replace_update_device_in_mapping_tree drop file global declare Anand Jain
2020-09-03 0:57 ` [PATCH 15/15] btrfs: fix replace of seed device Anand Jain
2020-09-03 10:46 ` [PATCH v3 1/15] btrfs: add btrfs_sysfs_add_device helper Anand Jain
2020-09-03 15:42 ` Josef Bacik
2020-09-03 11:35 ` [PATCH] fstests: btrfs/161: extend the test case to delete seed Anand Jain
2020-09-03 15:46 ` Josef Bacik
2020-09-04 9:13 ` [PATCH] btrfs: add a test case for btrfs seed device delete 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=7f81bf1c3e80e7b558d17c1caf049e0c431033ab.1599091832.git.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).