From: Matteo Croce <mcroce@linux.microsoft.com>
To: linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
Jens Axboe <axboe@kernel.dk>
Cc: linux-kernel@vger.kernel.org,
"Lennart Poettering" <lennart@poettering.net>,
"Luca Boccassi" <bluca@debian.org>,
"Alexander Viro" <viro@zeniv.linux.org.uk>,
"Damien Le Moal" <damien.lemoal@wdc.com>,
"Tejun Heo" <tj@kernel.org>,
"Javier González" <javier@javigon.com>,
"Niklas Cassel" <niklas.cassel@wdc.com>,
"Johannes Thumshirn" <johannes.thumshirn@wdc.com>,
"Hannes Reinecke" <hare@suse.de>,
"Matthew Wilcox" <willy@infradead.org>,
"Christoph Hellwig" <hch@infradead.org>,
JeffleXu <jefflexu@linux.alibaba.com>
Subject: [PATCH v3 3/6] block: refactor sysfs code
Date: Wed, 23 Jun 2021 12:58:55 +0200 [thread overview]
Message-ID: <20210623105858.6978-4-mcroce@linux.microsoft.com> (raw)
In-Reply-To: <20210623105858.6978-1-mcroce@linux.microsoft.com>
From: Matteo Croce <mcroce@microsoft.com>
Move the sysfs register code from a function named disk_add_events() to
a new function named disk_add_sysfs(). Also, rename the attribute list
with a more generic name than disk_events_attrs.
This is a prerequisite patch to export diskseq in sysfs later.
Signed-off-by: Matteo Croce <mcroce@microsoft.com>
---
block/genhd.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/block/genhd.c b/block/genhd.c
index c96b667136ee..610dd86fd4b6 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -39,6 +39,7 @@ static void disk_alloc_events(struct gendisk *disk);
static void disk_add_events(struct gendisk *disk);
static void disk_del_events(struct gendisk *disk);
static void disk_release_events(struct gendisk *disk);
+static void disk_add_sysfs(struct gendisk *disk);
void set_capacity(struct gendisk *disk, sector_t sectors)
{
@@ -560,6 +561,7 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
*/
WARN_ON_ONCE(!blk_get_queue(disk->queue));
+ disk_add_sysfs(disk);
disk_add_events(disk);
blk_integrity_add(disk);
}
@@ -1754,7 +1756,7 @@ static const DEVICE_ATTR(events_poll_msecs, 0644,
disk_events_poll_msecs_show,
disk_events_poll_msecs_store);
-static const struct attribute *disk_events_attrs[] = {
+static const struct attribute *disk_sysfs_attrs[] = {
&dev_attr_events.attr,
&dev_attr_events_async.attr,
&dev_attr_events_poll_msecs.attr,
@@ -1825,13 +1827,16 @@ static void disk_alloc_events(struct gendisk *disk)
disk->ev = ev;
}
-static void disk_add_events(struct gendisk *disk)
+static void disk_add_sysfs(struct gendisk *disk)
{
/* FIXME: error handling */
- if (sysfs_create_files(&disk_to_dev(disk)->kobj, disk_events_attrs) < 0)
+ if (sysfs_create_files(&disk_to_dev(disk)->kobj, disk_sysfs_attrs) < 0)
pr_warn("%s: failed to create sysfs files for events\n",
disk->disk_name);
+}
+static void disk_add_events(struct gendisk *disk)
+{
if (!disk->ev)
return;
@@ -1856,7 +1861,7 @@ static void disk_del_events(struct gendisk *disk)
mutex_unlock(&disk_events_mutex);
}
- sysfs_remove_files(&disk_to_dev(disk)->kobj, disk_events_attrs);
+ sysfs_remove_files(&disk_to_dev(disk)->kobj, disk_sysfs_attrs);
}
static void disk_release_events(struct gendisk *disk)
--
2.31.1
next prev parent reply other threads:[~2021-06-23 10:59 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-23 10:58 [PATCH v3 0/6] block: add a sequence number to disks Matteo Croce
2021-06-23 10:58 ` [PATCH v3 1/6] block: add disk sequence number Matteo Croce
2021-06-23 11:48 ` Christoph Hellwig
2021-06-23 13:10 ` Matteo Croce
2021-06-23 13:51 ` Lennart Poettering
2021-06-23 14:01 ` Hannes Reinecke
2021-06-23 14:07 ` Luca Boccassi
2021-06-23 14:21 ` Hannes Reinecke
2021-06-23 14:34 ` Luca Boccassi
2021-06-23 14:55 ` Lennart Poettering
2021-06-23 14:12 ` Lennart Poettering
2021-06-23 15:02 ` Hannes Reinecke
2021-06-23 15:34 ` Luca Boccassi
2021-06-23 15:48 ` Lennart Poettering
2021-06-23 14:28 ` Christoph Hellwig
2021-06-23 10:58 ` [PATCH v3 2/6] block: add ioctl to read the " Matteo Croce
2021-06-23 10:58 ` Matteo Croce [this message]
2021-06-23 11:52 ` [PATCH v3 3/6] block: refactor sysfs code Christoph Hellwig
2021-06-23 19:03 ` Matteo Croce
2021-06-24 6:12 ` Christoph Hellwig
2021-06-23 10:58 ` [PATCH v3 4/6] block: export diskseq in sysfs Matteo Croce
2021-06-23 10:58 ` [PATCH v3 5/6] block: increment sequence number Matteo Croce
2021-06-23 10:58 ` [PATCH v3 6/6] loop: " Matteo Croce
2021-06-23 11:57 ` Christoph Hellwig
2021-06-23 13:13 ` Luca Boccassi
2021-06-23 14:25 ` Christoph Hellwig
2021-06-23 15:29 ` Lennart Poettering
2021-06-24 6:11 ` Christoph Hellwig
2021-06-23 12:03 ` [PATCH v3 0/6] block: add a sequence number to disks Hannes Reinecke
2021-06-23 12:46 ` Luca Boccassi
2021-06-23 14:07 ` Lennart Poettering
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=20210623105858.6978-4-mcroce@linux.microsoft.com \
--to=mcroce@linux.microsoft.com \
--cc=axboe@kernel.dk \
--cc=bluca@debian.org \
--cc=damien.lemoal@wdc.com \
--cc=hare@suse.de \
--cc=hch@infradead.org \
--cc=javier@javigon.com \
--cc=jefflexu@linux.alibaba.com \
--cc=johannes.thumshirn@wdc.com \
--cc=lennart@poettering.net \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=niklas.cassel@wdc.com \
--cc=tj@kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.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).