From: Christoph Hellwig <hch@lst.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Jens Axboe <axboe@kernel.dk>, Tejun Heo <tj@kernel.org>,
linux-block@vger.kernel.org, linux-xfs@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 05/13] sysfs: refactor sysfs_add_file_mode_ns
Date: Mon, 13 Sep 2021 07:41:13 +0200 [thread overview]
Message-ID: <20210913054121.616001-6-hch@lst.de> (raw)
In-Reply-To: <20210913054121.616001-1-hch@lst.de>
Regroup the code so that preallocated attributes and normal attributes are
handled in clearly separate blocks.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/sysfs/file.c | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index f737bd61f71bf..74a2a8021c8bb 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -261,7 +261,7 @@ int sysfs_add_file_mode_ns(struct kernfs_node *parent,
struct kobject *kobj = parent->priv;
const struct sysfs_ops *sysfs_ops = kobj->ktype->sysfs_ops;
struct lock_class_key *key = NULL;
- const struct kernfs_ops *ops;
+ const struct kernfs_ops *ops = NULL;
struct kernfs_node *kn;
/* every kobject with an attribute needs a ktype assigned */
@@ -270,22 +270,23 @@ int sysfs_add_file_mode_ns(struct kernfs_node *parent,
kobject_name(kobj)))
return -EINVAL;
- if (sysfs_ops->show && sysfs_ops->store) {
- if (mode & SYSFS_PREALLOC)
+ if (mode & SYSFS_PREALLOC) {
+ if (sysfs_ops->show && sysfs_ops->store)
ops = &sysfs_prealloc_kfops_rw;
- else
- ops = &sysfs_file_kfops_rw;
- } else if (sysfs_ops->show) {
- if (mode & SYSFS_PREALLOC)
+ else if (sysfs_ops->show)
ops = &sysfs_prealloc_kfops_ro;
- else
- ops = &sysfs_file_kfops_ro;
- } else if (sysfs_ops->store) {
- if (mode & SYSFS_PREALLOC)
+ else if (sysfs_ops->store)
ops = &sysfs_prealloc_kfops_wo;
- else
+ } else {
+ if (sysfs_ops->show && sysfs_ops->store)
+ ops = &sysfs_file_kfops_rw;
+ else if (sysfs_ops->show)
+ ops = &sysfs_file_kfops_ro;
+ else if (sysfs_ops->store)
ops = &sysfs_file_kfops_wo;
- } else
+ }
+
+ if (!ops)
ops = &sysfs_file_kfops_empty;
#ifdef CONFIG_DEBUG_LOCK_ALLOC
--
2.30.2
next prev parent reply other threads:[~2021-09-13 5:47 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-13 5:41 start switching sysfs attributes to expose the seq_file Christoph Hellwig
2021-09-13 5:41 ` [PATCH 01/13] seq_file: mark seq_get_buf as deprecated Christoph Hellwig
2021-09-13 13:19 ` Christian Brauner
2021-09-13 16:22 ` Daniel Wagner
2021-09-13 16:29 ` Tejun Heo
2021-09-13 5:41 ` [PATCH 02/13] kernfs: remove kernfs_create_file and kernfs_create_file_ns Christoph Hellwig
2021-09-13 13:20 ` Christian Brauner
2021-09-13 5:41 ` [PATCH 03/13] kernfs: remove the unused lockdep_key field in struct kernfs_ops Christoph Hellwig
2021-09-13 13:21 ` Christian Brauner
2021-09-13 16:30 ` Tejun Heo
2021-09-13 5:41 ` [PATCH 04/13] sysfs: split out binary attribute handling from sysfs_add_file_mode_ns Christoph Hellwig
2021-09-13 13:26 ` Christian Brauner
2021-09-13 5:41 ` Christoph Hellwig [this message]
2021-09-13 13:27 ` [PATCH 05/13] sysfs: refactor sysfs_add_file_mode_ns Christian Brauner
2021-09-13 5:41 ` [PATCH 06/13] sysfs: simplify sysfs_kf_seq_show Christoph Hellwig
2021-09-13 5:41 ` [PATCH 07/13] sysfs: add ->seq_show support to sysfs_ops Christoph Hellwig
2021-09-13 13:30 ` Christian Brauner
2021-09-13 5:41 ` [PATCH 08/13] block: convert the blk_mq_hw_ctx attrs to use ->seq_show Christoph Hellwig
2021-09-13 5:41 ` [PATCH 09/13] block: convert the blk_integrity " Christoph Hellwig
2021-09-13 5:41 ` [PATCH 10/13] block: convert the request_queue " Christoph Hellwig
2021-09-13 5:41 ` [PATCH 11/13] block: convert the elevator_queue " Christoph Hellwig
2021-09-13 5:41 ` [PATCH 12/13] xfs: convert xfs_errortag " Christoph Hellwig
2021-09-13 5:41 ` [PATCH 13/13] xfs: convert xfs_sysfs " Christoph Hellwig
2021-09-13 6:27 ` Greg Kroah-Hartman
2021-09-14 1:20 ` Dave Chinner
2021-09-14 5:12 ` Greg Kroah-Hartman
2021-09-14 10:56 ` Dave Chinner
2021-09-14 7:30 ` Christoph Hellwig
2021-09-14 15:28 ` Greg Kroah-Hartman
2021-09-14 15:30 ` Christoph Hellwig
2021-09-14 15:41 ` Greg Kroah-Hartman
2021-09-15 7:04 ` Christoph Hellwig
2021-09-15 7:07 ` Greg Kroah-Hartman
2021-09-13 16:39 ` start switching sysfs attributes to expose the seq_file Bart Van Assche
2021-09-13 16:46 ` Greg Kroah-Hartman
2021-09-14 2:53 ` Bart Van Assche
2021-09-13 16:46 ` Tejun Heo
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=20210913054121.616001-6-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=gregkh@linuxfoundation.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=tj@kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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).