From: Kimberly Brown <kimbrownkd@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 3/8] block: Replace all ktype default_attrs with groups
Date: Mon, 1 Apr 2019 22:51:30 -0400 [thread overview]
Message-ID: <e3b82e2105d1e2b4d6313d862172007e0f4477e2.1554151487.git.kimbrownkd@gmail.com> (raw)
In-Reply-To: <cover.1554151487.git.kimbrownkd@gmail.com>
The kobj_type default_attrs field is being replaced by the
default_groups field. Replace all of the ktype default_attrs fields in
the block subsystem with default_groups and use the ATTRIBUTE_GROUPS
macro to create the default groups.
Remove default_ctx_attrs[] because it doesn't contain any attributes.
This patch was tested by verifying that the sysfs files for the
attributes in the default groups were created.
Signed-off-by: Kimberly Brown <kimbrownkd@gmail.com>
---
block/blk-integrity.c | 3 ++-
block/blk-mq-sysfs.c | 8 ++------
block/blk-sysfs.c | 3 ++-
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index d1ab089e0919..85864c71e858 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -365,6 +365,7 @@ static struct attribute *integrity_attrs[] = {
&integrity_device_entry.attr,
NULL,
};
+ATTRIBUTE_GROUPS(integrity);
static const struct sysfs_ops integrity_ops = {
.show = &integrity_attr_show,
@@ -372,7 +373,7 @@ static const struct sysfs_ops integrity_ops = {
};
static struct kobj_type integrity_ktype = {
- .default_attrs = integrity_attrs,
+ .default_groups = integrity_groups,
.sysfs_ops = &integrity_ops,
};
diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index 3f9c3f4ac44c..5315e538b3b1 100644
--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -173,10 +173,6 @@ static ssize_t blk_mq_hw_sysfs_cpus_show(struct blk_mq_hw_ctx *hctx, char *page)
return ret;
}
-static struct attribute *default_ctx_attrs[] = {
- NULL,
-};
-
static struct blk_mq_hw_ctx_sysfs_entry blk_mq_hw_sysfs_nr_tags = {
.attr = {.name = "nr_tags", .mode = 0444 },
.show = blk_mq_hw_sysfs_nr_tags_show,
@@ -196,6 +192,7 @@ static struct attribute *default_hw_ctx_attrs[] = {
&blk_mq_hw_sysfs_cpus.attr,
NULL,
};
+ATTRIBUTE_GROUPS(default_hw_ctx);
static const struct sysfs_ops blk_mq_sysfs_ops = {
.show = blk_mq_sysfs_show,
@@ -214,13 +211,12 @@ static struct kobj_type blk_mq_ktype = {
static struct kobj_type blk_mq_ctx_ktype = {
.sysfs_ops = &blk_mq_sysfs_ops,
- .default_attrs = default_ctx_attrs,
.release = blk_mq_ctx_sysfs_release,
};
static struct kobj_type blk_mq_hw_ktype = {
.sysfs_ops = &blk_mq_hw_sysfs_ops,
- .default_attrs = default_hw_ctx_attrs,
+ .default_groups = default_hw_ctx_groups,
.release = blk_mq_hw_sysfs_release,
};
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 422327089e0f..7a95a1eb27e1 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -769,6 +769,7 @@ static struct attribute *default_attrs[] = {
#endif
NULL,
};
+ATTRIBUTE_GROUPS(default);
#define to_queue(atr) container_of((atr), struct queue_sysfs_entry, attr)
@@ -890,7 +891,7 @@ static const struct sysfs_ops queue_sysfs_ops = {
struct kobj_type blk_queue_ktype = {
.sysfs_ops = &queue_sysfs_ops,
- .default_attrs = default_attrs,
+ .default_groups = default_groups,
.release = blk_release_queue,
};
--
2.17.1
next prev parent reply other threads:[~2019-04-02 2:51 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-22 20:14 [PATCH] kobject: Add support for default attribute groups to kobj_type Kimberly Brown
2019-03-23 6:07 ` Greg Kroah-Hartman
2019-03-24 3:48 ` Kimberly Brown
2019-03-24 5:15 ` Greg Kroah-Hartman
2019-04-02 2:51 ` [PATCH v2 0/8] kobject: Add default group support to kobj_type and replace subsystem uses Kimberly Brown
2019-04-02 2:51 ` [PATCH v2 1/8] kobject: Add support for default attribute groups to kobj_type Kimberly Brown
2019-04-02 2:51 ` [PATCH v2 2/8] samples/kobject: Replace foo_ktype's default_attrs field with groups Kimberly Brown
2019-04-02 2:51 ` Kimberly Brown [this message]
2019-04-02 16:02 ` [PATCH v2 3/8] block: Replace all ktype default_attrs " Bart Van Assche
2019-04-02 17:46 ` Greg Kroah-Hartman
2019-04-02 18:06 ` Bart Van Assche
2019-04-02 2:51 ` [PATCH v2 4/8] net-sysfs: Replace ktype default_attrs field " Kimberly Brown
2019-04-02 2:51 ` [PATCH v2 5/8] irqdesc: Replace irq_kobj_type's " Kimberly Brown
2019-04-02 8:04 ` Thomas Gleixner
2019-04-02 2:51 ` [PATCH v2 6/8] padata: Replace padata_attr_type " Kimberly Brown
2019-04-02 2:51 ` [PATCH v2 7/8] cpufreq: schedutil: Replace " Kimberly Brown
2019-04-02 7:56 ` Rafael J. Wysocki
2019-04-02 8:50 ` Peter Zijlstra
2019-04-02 2:51 ` [PATCH v2 8/8] livepatch: Replace klp_ktype_patch's default_attrs " Kimberly Brown
2019-04-02 10:22 ` Jiri Kosina
2019-04-03 11:51 ` Miroslav Benes
2019-04-08 14:16 ` Petr Mladek
2019-04-02 6:29 ` [PATCH v2 0/8] kobject: Add default group support to kobj_type and replace subsystem uses Greg Kroah-Hartman
2019-04-25 20:12 ` Greg Kroah-Hartman
2019-04-27 6:18 ` Kimberly Brown
2019-04-27 6:41 ` Greg Kroah-Hartman
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=e3b82e2105d1e2b4d6313d862172007e0f4477e2.1554151487.git.kimbrownkd@gmail.com \
--to=kimbrownkd@gmail.com \
--cc=axboe@kernel.dk \
--cc=gregkh@linuxfoundation.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael@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).