diff mbox series

[12/51] block/null_blk: Fix sparse warnings in tracing code

Message ID	20220623180528.3595304-13-bvanassche@acm.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-block-owner@kernel.org> From: Bart Van Assche <bvanassche@acm.org> To: Jens Axboe <axboe@kernel.dk> Cc: linux-block@vger.kernel.org, Christoph Hellwig <hch@lst.de>, Bart Van Assche <bvanassche@acm.org>, Ming Lei <ming.lei@redhat.com> Subject: [PATCH 12/51] block/null_blk: Fix sparse warnings in tracing code Date: Thu, 23 Jun 2022 11:04:49 -0700 Message-Id: <20220623180528.3595304-13-bvanassche@acm.org> In-Reply-To: <20220623180528.3595304-1-bvanassche@acm.org> References: <20220623180528.3595304-1-bvanassche@acm.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Improve static type checking for request flags \| expand [00/51] Improve static type checking for request flags [01/51] treewide: Rename enum req_opf into enum req_op [02/51] block: Use enum req_op where appropriate [03/51] block: Change the type of the last .rw_page() argument [04/51] block: Change the type of req_op() and bio_op() into enum req_op [05/51] block: Introduce the type blk_opf_t [06/51] block: Use the new blk_opf_t type [07/51] blktrace: Use the new blk_opf_t type [08/51] blktrace: Trace remap operations correctly [09/51] block/brd: Use the enum req_op type [10/51] block/drbd: Use the enum req_op and blk_opf_t types [11/51] block/floppy: Fix a sparse warning [12/51] block/null_blk: Fix sparse warnings in tracing code [13/51] um: Use enum req_op where appropriate [14/51] dm/core: Use the enum req_op and blk_opf_t types [15/51] dm/bufio: Change 'int rw' into 'enum req_op op' [16/51] dm/kcopyd: Rename kcopyd_job.rw into kcopyd_job.op [17/51] dm/ebs: Change 'int rw' into 'enum req_op op' [18/51] dm/dm-flakey: Use the new blk_opf_t type [19/51] dm/dm-integrity: Use the enum req_op and blk_opf_t types [20/51] dm/dm-snap: Use the enum req_op and blk_opf_t types [21/51] dm/dm-zoned: Use the enum req_op type [22/51] md/core: Use the enum req_op and blk_opf_t types [23/51] md/bcache: Use the enum req_op and blk_opf_t types [24/51] md/raid1: Use the new blk_opf_t type [25/51] md/raid10: Use the new blk_opf_t type [26/51] md/raid5: Use the enum req_op and blk_opf_t types [27/51] nvme/host: Use the enum req_op and blk_opf_t types [28/51] nvme/target: Use the new blk_opf_t type [29/51] scsi/core: Improve static type checking [30/51] scsi/core: Change the return type of scsi_noretry_cmd() into bool [31/51] scsi/core: Use the new blk_opf_t type [32/51] scsi/device_handlers: Use the new blk_opf_t type [33/51] scsi/ufs: Rename a 'dir' argument into 'op' [34/51] scsi/target: Use the new blk_opf_t type [35/51] mm: Use the new blk_opf_t type [36/51] fs/buffer: Use the new blk_opf_t type [37/51] fs/direct-io: Use the enum req_op and blk_opf_t types [38/51] fs/mpage: Use the new blk_opf_t type [39/51] fs/btrfs: Use the enum req_op and blk_opf_t types [40/51] fs/ext4: Use the new blk_opf_t type [41/51] fs/f2fs: Use the enum req_op and blk_opf_t types [42/51] fs/gfs2: Use the enum req_op and blk_opf_t types [43/51] fs/hfsplus: Use the enum req_op and blk_opf_t types [44/51] fs/iomap: Use the new blk_opf_t type [45/51] fs/jbd2: Fix the documentation of the jbd2_write_superblock() callers [46/51] fs/nilfs: Use the enum req_op and blk_opf_t types [47/51] fs/ntfs3: Use enum req_op where appropriate [48/51] fs/ocfs2: Use the enum req_op and blk_opf_t types [49/51] PM: Use the enum req_op and blk_opf_t types [50/51] fs/xfs: Use the enum req_op and blk_opf_t types [51/51] fs/zonefs: Fix sparse warnings in tracing code

Commit Message

Bart Van Assche June 23, 2022, 6:04 p.m. UTC

Since the tracing infrastructure does not support bitwise types, store
the request operation as an int. This patch does not change any
functionality.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 drivers/block/null_blk/trace.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/drivers/block/null_blk/trace.h b/drivers/block/null_blk/trace.h
index 6b2b370e786f..f79467e5310f 100644
--- a/drivers/block/null_blk/trace.h
+++ b/drivers/block/null_blk/trace.h
@@ -36,19 +36,19 @@  TRACE_EVENT(nullb_zone_op,
 	    TP_ARGS(cmd, zone_no, zone_cond),
 	    TP_STRUCT__entry(
 		__array(char, disk, DISK_NAME_LEN)
-		__field(enum req_op, op)
+		__field(int, op)
 		__field(unsigned int, zone_no)
 		__field(unsigned int, zone_cond)
 	    ),
 	    TP_fast_assign(
-		__entry->op = req_op(cmd->rq);
+		__entry->op = (__force int)req_op(cmd->rq);
 		__entry->zone_no = zone_no;
 		__entry->zone_cond = zone_cond;
 		__assign_disk_name(__entry->disk, cmd->rq->q->disk);
 	    ),
 	    TP_printk("%s req=%-15s zone_no=%u zone_cond=%-10s",
 		      __print_disk_name(__entry->disk),
-		      blk_op_str(__entry->op),
+		      blk_op_str((__force enum req_op)__entry->op),
 		      __entry->zone_no,
 		      blk_zone_cond_str(__entry->zone_cond))
 );