Commit 70e3c62b authored Oct 22, 2025 by Johannes Thumshirn Committed by Jens Axboe Oct 22, 2025

blktrace: untangle if/else sequence in __blk_add_trace



Untangle the if/else sequence setting the trace action in
__blk_add_trace() and turn it into a switch statement for better
extensibility.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 04678e72

kernel/trace/blktrace.c

+11 −2

Original line number	Diff line number	Diff line
		@@ -278,10 +278,19 @@ static void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes,
		what \|= MASK_TC_BIT(opf, META);
		what \|= MASK_TC_BIT(opf, PREFLUSH);
		what \|= MASK_TC_BIT(opf, FUA);
		if (op == REQ_OP_DISCARD \|\| op == REQ_OP_SECURE_ERASE)

		switch (op) {
		case REQ_OP_DISCARD:
		case REQ_OP_SECURE_ERASE:
		what \|= BLK_TC_ACT(BLK_TC_DISCARD);
		if (op == REQ_OP_FLUSH)
		break;
		case REQ_OP_FLUSH:
		what \|= BLK_TC_ACT(BLK_TC_FLUSH);
		break;
		default:
		break;
		}

		if (cgid)
		what \|= __BLK_TA_CGROUP;