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 01/15] btrfs: add btrfs_sysfs_add_device helper
Date: Thu,  3 Sep 2020 08:57:37 +0800	[thread overview]
Message-ID: <5f8aa8a03a1712adba0023fc1efa18623571c588.1599091832.git.anand.jain@oracle.com> (raw)
In-Reply-To: <cover.1599091832.git.anand.jain@oracle.com>

btrfs_sysfs_add_devices_dir() adds device link and devid kobject
(sysfs entries) for a device or all the devices in the btrfs_fs_devices.
In preparation to add these sysfs entries for the seed as well, add
a btrfs_sysfs_add_device() helper function and avoid code duplication.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 fs/btrfs/sysfs.c | 79 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 53 insertions(+), 26 deletions(-)

diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 190e59152be5..3381a91d7deb 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -1271,44 +1271,71 @@ static struct kobj_type devid_ktype = {
 	.release	= btrfs_release_devid_kobj,
 };
 
-int btrfs_sysfs_add_devices_dir(struct btrfs_fs_devices *fs_devices,
-				struct btrfs_device *one_device)
+static int btrfs_sysfs_add_device(struct btrfs_device *device)
 {
-	int error = 0;
-	struct btrfs_device *dev;
+	int ret;
 	unsigned int nofs_flag;
+	struct kobject *devices_kobj;
+        struct kobject *devinfo_kobj;
 
-	nofs_flag = memalloc_nofs_save();
-	list_for_each_entry(dev, &fs_devices->devices, dev_list) {
+	/*
+	 * make sure we use the fs_info::fs_devices to fetch the kobjects
+	 * even for the seed fs_devices
+	 */
+	devices_kobj = device->fs_devices->fs_info->fs_devices->devices_kobj;
+	devinfo_kobj = device->fs_devices->fs_info->fs_devices->devinfo_kobj;
+	ASSERT(devices_kobj);
+	ASSERT(devinfo_kobj);
 
-		if (one_device && one_device != dev)
-			continue;
+	nofs_flag = memalloc_nofs_save();
 
-		if (dev->bdev) {
-			struct hd_struct *disk;
-			struct kobject *disk_kobj;
+	if (device->bdev) {
+		struct hd_struct *disk;
+		struct kobject *disk_kobj;
 
-			disk = dev->bdev->bd_part;
-			disk_kobj = &part_to_dev(disk)->kobj;
+		disk = device->bdev->bd_part;
+		disk_kobj = &part_to_dev(disk)->kobj;
 
-			error = sysfs_create_link(fs_devices->devices_kobj,
-						  disk_kobj, disk_kobj->name);
-			if (error)
-				break;
+		ret = sysfs_create_link(devices_kobj, disk_kobj,
+					disk_kobj->name);
+		if (ret) {
+			btrfs_warn(device->fs_info,
+			   "sysfs create device link failed %d devid %llu",
+				   ret, device->devid);
+			goto out;
 		}
+	}
 
-		init_completion(&dev->kobj_unregister);
-		error = kobject_init_and_add(&dev->devid_kobj, &devid_ktype,
-					     fs_devices->devinfo_kobj, "%llu",
-					     dev->devid);
-		if (error) {
-			kobject_put(&dev->devid_kobj);
-			break;
-		}
+	init_completion(&device->kobj_unregister);
+	ret = kobject_init_and_add(&device->devid_kobj, &devid_ktype,
+				   devinfo_kobj, "%llu", device->devid);
+	if (ret) {
+		kobject_put(&device->devid_kobj);
+		btrfs_warn(device->fs_info,
+			   "sysfs devinfo init failed %d devid %llu",
+			   ret, device->devid);
 	}
+
+out:
 	memalloc_nofs_restore(nofs_flag);
+	return ret;
+}
 
-	return error;
+int btrfs_sysfs_add_devices_dir(struct btrfs_fs_devices *fs_devices,
+				struct btrfs_device *one_device)
+{
+	int ret;
+
+	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);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
 }
 
 void btrfs_kobject_uevent(struct block_device *bdev, enum kobject_action action)
-- 
2.25.1


  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 ` Anand Jain [this message]
2020-09-03  8:40   ` [PATCH 01/15] btrfs: add btrfs_sysfs_add_device helper 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 ` [PATCH 04/15] btrfs: refactor btrfs_sysfs_add_devices_dir Anand Jain
2020-09-03  8:45   ` 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=5f8aa8a03a1712adba0023fc1efa18623571c588.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).