mirror of
https://github.com/torvalds/linux
synced 2024-10-06 11:25:23 +00:00
block: Move zone related debugfs attribute to blk-zoned.c
block/blk-mq-debugfs-zone.c contains a single debugfs attribute function. Defining this outside of block/blk-zoned.c does not really help in any way, so move this zone related debugfs attribute to block/blk-zoned.c and delete block/blk-mq-debugfs-zone.c. Signed-off-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Bart Van Assche <bvanassche@acm.org> Tested-by: Hans Holmberg <hans.holmberg@wdc.com> Tested-by: Dennis Maisenbacher <dennis.maisenbacher@wdc.com> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Link: https://lore.kernel.org/r/20240408014128.205141-25-dlemoal@kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
bca150f0d4
commit
d9f1439a30
|
@ -198,10 +198,6 @@ config BLK_DEBUG_FS
|
||||||
Unless you are building a kernel for a tiny system, you should
|
Unless you are building a kernel for a tiny system, you should
|
||||||
say Y here.
|
say Y here.
|
||||||
|
|
||||||
config BLK_DEBUG_FS_ZONED
|
|
||||||
bool
|
|
||||||
default BLK_DEBUG_FS && BLK_DEV_ZONED
|
|
||||||
|
|
||||||
config BLK_SED_OPAL
|
config BLK_SED_OPAL
|
||||||
bool "Logic for interfacing with Opal enabled SEDs"
|
bool "Logic for interfacing with Opal enabled SEDs"
|
||||||
depends on KEYS
|
depends on KEYS
|
||||||
|
|
|
@ -33,7 +33,6 @@ obj-$(CONFIG_BLK_MQ_VIRTIO) += blk-mq-virtio.o
|
||||||
obj-$(CONFIG_BLK_DEV_ZONED) += blk-zoned.o
|
obj-$(CONFIG_BLK_DEV_ZONED) += blk-zoned.o
|
||||||
obj-$(CONFIG_BLK_WBT) += blk-wbt.o
|
obj-$(CONFIG_BLK_WBT) += blk-wbt.o
|
||||||
obj-$(CONFIG_BLK_DEBUG_FS) += blk-mq-debugfs.o
|
obj-$(CONFIG_BLK_DEBUG_FS) += blk-mq-debugfs.o
|
||||||
obj-$(CONFIG_BLK_DEBUG_FS_ZONED)+= blk-mq-debugfs-zoned.o
|
|
||||||
obj-$(CONFIG_BLK_SED_OPAL) += sed-opal.o
|
obj-$(CONFIG_BLK_SED_OPAL) += sed-opal.o
|
||||||
obj-$(CONFIG_BLK_PM) += blk-pm.o
|
obj-$(CONFIG_BLK_PM) += blk-pm.o
|
||||||
obj-$(CONFIG_BLK_INLINE_ENCRYPTION) += blk-crypto.o blk-crypto-profile.o \
|
obj-$(CONFIG_BLK_INLINE_ENCRYPTION) += blk-crypto.o blk-crypto-profile.o \
|
||||||
|
|
|
@ -1,22 +0,0 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0
|
|
||||||
/*
|
|
||||||
* Copyright (C) 2017 Western Digital Corporation or its affiliates.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <linux/blkdev.h>
|
|
||||||
#include "blk-mq-debugfs.h"
|
|
||||||
|
|
||||||
int queue_zone_wlock_show(void *data, struct seq_file *m)
|
|
||||||
{
|
|
||||||
struct request_queue *q = data;
|
|
||||||
unsigned int i;
|
|
||||||
|
|
||||||
if (!q->disk->seq_zones_wlock)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
for (i = 0; i < q->disk->nr_zones; i++)
|
|
||||||
if (test_bit(i, q->disk->seq_zones_wlock))
|
|
||||||
seq_printf(m, "%u\n", i);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
|
@ -83,7 +83,7 @@ static inline void blk_mq_debugfs_unregister_rqos(struct rq_qos *rqos)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_BLK_DEBUG_FS_ZONED
|
#if defined(CONFIG_BLK_DEV_ZONED) && defined(CONFIG_BLK_DEBUG_FS)
|
||||||
int queue_zone_wlock_show(void *data, struct seq_file *m);
|
int queue_zone_wlock_show(void *data, struct seq_file *m);
|
||||||
#else
|
#else
|
||||||
static inline int queue_zone_wlock_show(void *data, struct seq_file *m)
|
static inline int queue_zone_wlock_show(void *data, struct seq_file *m)
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
|
|
||||||
#include "blk.h"
|
#include "blk.h"
|
||||||
#include "blk-mq-sched.h"
|
#include "blk-mq-sched.h"
|
||||||
|
#include "blk-mq-debugfs.h"
|
||||||
|
|
||||||
#define ZONE_COND_NAME(name) [BLK_ZONE_COND_##name] = #name
|
#define ZONE_COND_NAME(name) [BLK_ZONE_COND_##name] = #name
|
||||||
static const char *const zone_cond_name[] = {
|
static const char *const zone_cond_name[] = {
|
||||||
|
@ -1804,3 +1805,22 @@ int blk_revalidate_disk_zones(struct gendisk *disk)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(blk_revalidate_disk_zones);
|
EXPORT_SYMBOL_GPL(blk_revalidate_disk_zones);
|
||||||
|
|
||||||
|
#ifdef CONFIG_BLK_DEBUG_FS
|
||||||
|
|
||||||
|
int queue_zone_wlock_show(void *data, struct seq_file *m)
|
||||||
|
{
|
||||||
|
struct request_queue *q = data;
|
||||||
|
unsigned int i;
|
||||||
|
|
||||||
|
if (!q->disk->seq_zones_wlock)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
for (i = 0; i < q->disk->nr_zones; i++)
|
||||||
|
if (test_bit(i, q->disk->seq_zones_wlock))
|
||||||
|
seq_printf(m, "%u\n", i);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue