From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: Song Liu <song@kernel.org>, Hans de Goede <hdegoede@redhat.com>, Richard Weinberger <richard@nod.at>, Minchan Kim <minchan@kernel.org>, linux-mtd@lists.infradead.org, dm-devel@redhat.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, drbd-dev@lists.linbit.com, linux-raid@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org Subject: [PATCH 07/14] block: make QUEUE_SYSFS_BIT_FNS a little more useful Date: Wed, 22 Jul 2020 08:25:45 +0200 [thread overview] Message-ID: <20200722062552.212200-8-hch@lst.de> (raw) In-Reply-To: <20200722062552.212200-1-hch@lst.de> Generate the queue_sysfs_entry given that we have all the required information for it, and rename the generated show and store methods to match the other ones in the file. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/blk-sysfs.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index ce418d9128a0b2..cfbb039da8751f 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -257,16 +257,16 @@ static ssize_t queue_max_hw_sectors_show(struct request_queue *q, char *page) return queue_var_show(max_hw_sectors_kb, (page)); } -#define QUEUE_SYSFS_BIT_FNS(name, flag, neg) \ +#define QUEUE_SYSFS_BIT_FNS(_name, flag, neg) \ static ssize_t \ -queue_show_##name(struct request_queue *q, char *page) \ +queue_##_name##_show(struct request_queue *q, char *page) \ { \ int bit; \ bit = test_bit(QUEUE_FLAG_##flag, &q->queue_flags); \ return queue_var_show(neg ? !bit : bit, page); \ } \ static ssize_t \ -queue_store_##name(struct request_queue *q, const char *page, size_t count) \ +queue_##_name##_store(struct request_queue *q, const char *page, size_t count) \ { \ unsigned long val; \ ssize_t ret; \ @@ -281,7 +281,12 @@ queue_store_##name(struct request_queue *q, const char *page, size_t count) \ else \ blk_queue_flag_clear(QUEUE_FLAG_##flag, q); \ return ret; \ -} +} \ +static struct queue_sysfs_entry queue_##_name##_entry = { \ + .attr = { .name = __stringify(_name), .mode = 0644 }, \ + .show = queue_##_name##_show, \ + .store = queue_##_name##_store, \ +}; QUEUE_SYSFS_BIT_FNS(nonrot, NONROT, 1); QUEUE_SYSFS_BIT_FNS(random, ADD_RANDOM, 0); @@ -661,12 +666,6 @@ static struct queue_sysfs_entry queue_zone_append_max_entry = { .show = queue_zone_append_max_show, }; -static struct queue_sysfs_entry queue_nonrot_entry = { - .attr = {.name = "rotational", .mode = 0644 }, - .show = queue_show_nonrot, - .store = queue_store_nonrot, -}; - static struct queue_sysfs_entry queue_zoned_entry = { .attr = {.name = "zoned", .mode = 0444 }, .show = queue_zoned_show, @@ -699,18 +698,6 @@ static struct queue_sysfs_entry queue_rq_affinity_entry = { .store = queue_rq_affinity_store, }; -static struct queue_sysfs_entry queue_iostats_entry = { - .attr = {.name = "iostats", .mode = 0644 }, - .show = queue_show_iostats, - .store = queue_store_iostats, -}; - -static struct queue_sysfs_entry queue_random_entry = { - .attr = {.name = "add_random", .mode = 0644 }, - .show = queue_show_random, - .store = queue_store_random, -}; - static struct queue_sysfs_entry queue_poll_entry = { .attr = {.name = "io_poll", .mode = 0644 }, .show = queue_poll_show, -- 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: linux-raid@vger.kernel.org, Hans de Goede <hdegoede@redhat.com>, Minchan Kim <minchan@kernel.org>, Richard Weinberger <richard@nod.at>, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Song Liu <song@kernel.org>, dm-devel@redhat.com, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, drbd-dev@lists.linbit.com Subject: [PATCH 07/14] block: make QUEUE_SYSFS_BIT_FNS a little more useful Date: Wed, 22 Jul 2020 08:25:45 +0200 [thread overview] Message-ID: <20200722062552.212200-8-hch@lst.de> (raw) In-Reply-To: <20200722062552.212200-1-hch@lst.de> Generate the queue_sysfs_entry given that we have all the required information for it, and rename the generated show and store methods to match the other ones in the file. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/blk-sysfs.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index ce418d9128a0b2..cfbb039da8751f 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -257,16 +257,16 @@ static ssize_t queue_max_hw_sectors_show(struct request_queue *q, char *page) return queue_var_show(max_hw_sectors_kb, (page)); } -#define QUEUE_SYSFS_BIT_FNS(name, flag, neg) \ +#define QUEUE_SYSFS_BIT_FNS(_name, flag, neg) \ static ssize_t \ -queue_show_##name(struct request_queue *q, char *page) \ +queue_##_name##_show(struct request_queue *q, char *page) \ { \ int bit; \ bit = test_bit(QUEUE_FLAG_##flag, &q->queue_flags); \ return queue_var_show(neg ? !bit : bit, page); \ } \ static ssize_t \ -queue_store_##name(struct request_queue *q, const char *page, size_t count) \ +queue_##_name##_store(struct request_queue *q, const char *page, size_t count) \ { \ unsigned long val; \ ssize_t ret; \ @@ -281,7 +281,12 @@ queue_store_##name(struct request_queue *q, const char *page, size_t count) \ else \ blk_queue_flag_clear(QUEUE_FLAG_##flag, q); \ return ret; \ -} +} \ +static struct queue_sysfs_entry queue_##_name##_entry = { \ + .attr = { .name = __stringify(_name), .mode = 0644 }, \ + .show = queue_##_name##_show, \ + .store = queue_##_name##_store, \ +}; QUEUE_SYSFS_BIT_FNS(nonrot, NONROT, 1); QUEUE_SYSFS_BIT_FNS(random, ADD_RANDOM, 0); @@ -661,12 +666,6 @@ static struct queue_sysfs_entry queue_zone_append_max_entry = { .show = queue_zone_append_max_show, }; -static struct queue_sysfs_entry queue_nonrot_entry = { - .attr = {.name = "rotational", .mode = 0644 }, - .show = queue_show_nonrot, - .store = queue_store_nonrot, -}; - static struct queue_sysfs_entry queue_zoned_entry = { .attr = {.name = "zoned", .mode = 0444 }, .show = queue_zoned_show, @@ -699,18 +698,6 @@ static struct queue_sysfs_entry queue_rq_affinity_entry = { .store = queue_rq_affinity_store, }; -static struct queue_sysfs_entry queue_iostats_entry = { - .attr = {.name = "iostats", .mode = 0644 }, - .show = queue_show_iostats, - .store = queue_store_iostats, -}; - -static struct queue_sysfs_entry queue_random_entry = { - .attr = {.name = "add_random", .mode = 0644 }, - .show = queue_show_random, - .store = queue_store_random, -}; - static struct queue_sysfs_entry queue_poll_entry = { .attr = {.name = "io_poll", .mode = 0644 }, .show = queue_poll_show, -- 2.27.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-07-22 6:25 UTC|newest] Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-22 6:25 bdi cleanups v2 Christoph Hellwig 2020-07-22 6:25 ` Christoph Hellwig 2020-07-22 6:25 ` [PATCH 01/14] fs: remove the unused SB_I_MULTIROOT flag Christoph Hellwig 2020-07-22 6:25 ` Christoph Hellwig 2020-07-22 6:54 ` Johannes Thumshirn 2020-07-22 6:54 ` Johannes Thumshirn 2020-07-22 6:25 ` [PATCH 02/14] drbd: remove dead code in device_to_statistics Christoph Hellwig 2020-07-22 6:25 ` Christoph Hellwig 2020-07-22 7:03 ` Johannes Thumshirn 2020-07-22 7:03 ` Johannes Thumshirn [not found] ` <SN4PR0401MB3598495DA5AF46CAF019BDC69B790-OZENnpeWoeG1GMmP3NTBp/nBZW37Ciw+nBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org> 2020-07-22 7:07 ` Christoph Hellwig 2020-07-22 7:07 ` Christoph Hellwig 2020-07-22 7:07 ` Christoph Hellwig 2020-07-22 7:14 ` Johannes Thumshirn 2020-07-22 7:14 ` Johannes Thumshirn 2020-07-22 7:14 ` Johannes Thumshirn 2020-07-22 6:25 ` [PATCH 04/14] bdi: initialize ->ra_pages in bdi_init Christoph Hellwig 2020-07-22 6:25 ` Christoph Hellwig [not found] ` <20200722062552.212200-5-hch-jcswGhMUV9g@public.gmane.org> 2020-07-22 9:04 ` David Sterba 2020-07-22 9:04 ` David Sterba 2020-07-22 9:04 ` David Sterba 2020-07-22 11:15 ` Richard Weinberger 2020-07-22 11:15 ` Richard Weinberger 2020-07-22 11:15 ` Richard Weinberger 2020-07-22 11:15 ` Richard Weinberger 2020-07-22 6:25 ` [PATCH 05/14] md: update the optimal I/O size on reshape Christoph Hellwig 2020-07-22 6:25 ` Christoph Hellwig 2020-07-22 6:25 ` [PATCH 06/14] block: lift setting the readahead size into the block layer Christoph Hellwig 2020-07-22 6:25 ` Christoph Hellwig 2020-07-22 7:13 ` Johannes Thumshirn 2020-07-22 7:13 ` Johannes Thumshirn 2020-07-22 7:13 ` Johannes Thumshirn [not found] ` <SN4PR0401MB3598470B14C754768A2D8F389B790-OZENnpeWoeG1GMmP3NTBp/nBZW37Ciw+nBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org> 2020-07-22 7:18 ` Christoph Hellwig 2020-07-22 7:18 ` Christoph Hellwig 2020-07-22 7:18 ` Christoph Hellwig 2020-07-22 6:25 ` Christoph Hellwig [this message] 2020-07-22 6:25 ` [PATCH 07/14] block: make QUEUE_SYSFS_BIT_FNS a little more useful Christoph Hellwig 2020-07-22 7:17 ` Johannes Thumshirn 2020-07-22 7:17 ` Johannes Thumshirn 2020-07-22 6:25 ` [PATCH 08/14] block: add helper macros for queue sysfs entries Christoph Hellwig 2020-07-22 6:25 ` Christoph Hellwig 2020-07-22 7:20 ` Johannes Thumshirn 2020-07-22 7:20 ` Johannes Thumshirn 2020-07-22 6:25 ` [PATCH 09/14] bdi: remove BDI_CAP_CGROUP_WRITEBACK Christoph Hellwig 2020-07-22 6:25 ` Christoph Hellwig 2020-07-22 7:45 ` Johannes Thumshirn 2020-07-22 7:45 ` Johannes Thumshirn 2020-07-26 9:01 ` Wols Lists 2020-07-26 9:01 ` Wols Lists 2020-07-22 6:25 ` [PATCH 10/14] bdi: remove BDI_CAP_SYNCHRONOUS_IO Christoph Hellwig 2020-07-22 6:25 ` Christoph Hellwig 2020-07-22 6:25 ` [PATCH 11/14] mm: use SWP_SYNCHRONOUS_IO more intelligently Christoph Hellwig 2020-07-22 6:25 ` Christoph Hellwig 2020-07-22 16:26 ` Shakeel Butt 2020-07-22 16:26 ` Shakeel Butt 2020-07-22 16:26 ` Shakeel Butt 2020-07-22 6:25 ` [PATCH 12/14] bdi: replace BDI_CAP_STABLE_WRITES with a queue and a sb flag Christoph Hellwig 2020-07-22 6:25 ` Christoph Hellwig 2020-07-22 6:25 ` [PATCH 13/14] bdi: invert BDI_CAP_NO_ACCT_WB Christoph Hellwig 2020-07-22 6:25 ` Christoph Hellwig [not found] ` <20200722062552.212200-1-hch-jcswGhMUV9g@public.gmane.org> 2020-07-22 6:25 ` [PATCH 03/14] drbd: remove RB_CONGESTED_REMOTE Christoph Hellwig 2020-07-22 6:25 ` Christoph Hellwig 2020-07-22 6:25 ` Christoph Hellwig 2020-07-22 7:06 ` Johannes Thumshirn 2020-07-22 7:06 ` Johannes Thumshirn 2020-07-22 7:06 ` Johannes Thumshirn 2020-07-22 6:25 ` [PATCH 14/14] bdi: replace BDI_CAP_NO_{WRITEBACK,ACCT_DIRTY} with a single flag Christoph Hellwig 2020-07-22 6:25 ` [PATCH 14/14] bdi: replace BDI_CAP_NO_{WRITEBACK, ACCT_DIRTY} " Christoph Hellwig 2020-07-22 6:25 ` [PATCH 14/14] bdi: replace BDI_CAP_NO_{WRITEBACK,ACCT_DIRTY} " Christoph Hellwig -- strict thread matches above, loose matches on Subject: below -- 2020-07-26 15:03 bdi cleanups v3 Christoph Hellwig [not found] ` <20200726150333.305527-1-hch-jcswGhMUV9g@public.gmane.org> 2020-07-26 15:03 ` [PATCH 07/14] block: make QUEUE_SYSFS_BIT_FNS a little more useful Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-24 7:32 bdi cleanups v3 Christoph Hellwig [not found] ` <20200724073313.138789-1-hch-jcswGhMUV9g@public.gmane.org> 2020-07-24 7:33 ` [PATCH 07/14] block: make QUEUE_SYSFS_BIT_FNS a little more useful Christoph Hellwig 2020-07-24 7:33 ` Christoph Hellwig 2020-07-24 7:33 ` Christoph Hellwig 2020-07-20 7:51 bdi cleanups Christoph Hellwig [not found] ` <20200720075148.172156-1-hch-jcswGhMUV9g@public.gmane.org> 2020-07-20 7:51 ` [PATCH 07/14] block: make QUEUE_SYSFS_BIT_FNS a little more useful Christoph Hellwig 2020-07-20 7:51 ` Christoph Hellwig 2020-07-20 7:51 ` Christoph Hellwig
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=20200722062552.212200-8-hch@lst.de \ --to=hch@lst.de \ --cc=axboe@kernel.dk \ --cc=cgroups@vger.kernel.org \ --cc=dm-devel@redhat.com \ --cc=drbd-dev@lists.linbit.com \ --cc=hdegoede@redhat.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-mtd@lists.infradead.org \ --cc=linux-raid@vger.kernel.org \ --cc=minchan@kernel.org \ --cc=richard@nod.at \ --cc=song@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.