From: Torra Sowmya <sowmyatorra@gmail.com>
To: James.Bottomley@HansenPartnership.com, mkp@kernel.org
Cc: johannes.thumshirn@wdc.com, axboe@kernel.dk, dlemoal@kernel.org,
bvanassche@acm.org, linux-scsi@vger.kernel.org,
linux-kernel@vger.kernel.org, outreachy@lists.linux.dev,
rostedt@goodmis.org, julianbraha@gmail.com,
julia.lawall@inria.fr
Subject: [PATCH] scsi: sd: Remove unused zone append tracepoints
Date: Sun, 8 Nov 2026 12:16:26 +0530 [thread overview]
Message-ID: <20261108064626.5539-1-sowmyatorra@gmail.com> (raw)
In-Reply-To: <20261025151702.13434-1-sowmyatorra@gmail.com>
Commit 1846f308d66f ("scsi: sd: Use the block layer zone append
emulation") removed the calls to scsi_prepare_zone_append and
scsi_zone_wp_update, but left their definitions in sd_trace.h.
Consequently, sd_zbc.c still generates code and data for events
that have no remaining callers.
Remove sd_trace.h, which contains only these two events, and
remove its include and CREATE_TRACE_POINTS definition from
sd_zbc.c.
Fixes: 1846f308d66f ("scsi: sd: Use the block layer zone append emulation")
Signed-off-by: Torra Sowmya <sowmyatorra@gmail.com>
---
drivers/scsi/sd_trace.h | 84 -----------------------------------------
drivers/scsi/sd_zbc.c | 3 --
2 files changed, 87 deletions(-)
delete mode 100644 drivers/scsi/sd_trace.h
diff --git a/drivers/scsi/sd_trace.h b/drivers/scsi/sd_trace.h
deleted file mode 100644
index cba3c0b825ba..000000000000
--- a/drivers/scsi/sd_trace.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (C) 2022 Western Digital Corporation or its affiliates.
- */
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM sd
-
-#undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_FILE sd_trace
-
-#if !defined(_SD_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
-#include <scsi/scsi_cmnd.h>
-#include <scsi/scsi_host.h>
-#include <linux/tracepoint.h>
-
-TRACE_EVENT(scsi_prepare_zone_append,
-
- TP_PROTO(struct scsi_cmnd *cmnd, sector_t lba,
- unsigned int wp_offset),
-
- TP_ARGS(cmnd, lba, wp_offset),
-
- TP_STRUCT__entry(
- __field( unsigned int, host_no )
- __field( unsigned int, channel )
- __field( unsigned int, id )
- __field( unsigned int, lun )
- __field( sector_t, lba )
- __field( unsigned int, wp_offset )
- ),
-
- TP_fast_assign(
- __entry->host_no = cmnd->device->host->host_no;
- __entry->channel = cmnd->device->channel;
- __entry->id = cmnd->device->id;
- __entry->lun = cmnd->device->lun;
- __entry->lba = lba;
- __entry->wp_offset = wp_offset;
- ),
-
- TP_printk("host_no=%u, channel=%u id=%u lun=%u lba=%llu wp_offset=%u",
- __entry->host_no, __entry->channel, __entry->id,
- __entry->lun, __entry->lba, __entry->wp_offset)
-);
-
-TRACE_EVENT(scsi_zone_wp_update,
-
- TP_PROTO(struct scsi_cmnd *cmnd, sector_t rq_sector,
- unsigned int wp_offset, unsigned int good_bytes),
-
- TP_ARGS(cmnd, rq_sector, wp_offset, good_bytes),
-
- TP_STRUCT__entry(
- __field( unsigned int, host_no )
- __field( unsigned int, channel )
- __field( unsigned int, id )
- __field( unsigned int, lun )
- __field( sector_t, rq_sector )
- __field( unsigned int, wp_offset )
- __field( unsigned int, good_bytes )
- ),
-
- TP_fast_assign(
- __entry->host_no = cmnd->device->host->host_no;
- __entry->channel = cmnd->device->channel;
- __entry->id = cmnd->device->id;
- __entry->lun = cmnd->device->lun;
- __entry->rq_sector = rq_sector;
- __entry->wp_offset = wp_offset;
- __entry->good_bytes = good_bytes;
- ),
-
- TP_printk("host_no=%u, channel=%u id=%u lun=%u rq_sector=%llu" \
- " wp_offset=%u good_bytes=%u",
- __entry->host_no, __entry->channel, __entry->id,
- __entry->lun, __entry->rq_sector, __entry->wp_offset,
- __entry->good_bytes)
-);
-#endif /* _SD_TRACE_H */
-
-/* This part must be outside protection */
-#undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH ../../drivers/scsi
-#include <trace/define_trace.h>
diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c
index 56e455fb5add..a7bdf089e142 100644
--- a/drivers/scsi/sd_zbc.c
+++ b/drivers/scsi/sd_zbc.c
@@ -20,9 +20,6 @@
#include "sd.h"
-#define CREATE_TRACE_POINTS
-#include "sd_trace.h"
-
/* Whether or not a SCSI zone descriptor describes a gap zone. */
static bool sd_zbc_is_gap_zone(const u8 buf[64])
{
--
2.47.3
parent reply other threads:[~2026-11-08 6:47 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <20261025151702.13434-1-sowmyatorra@gmail.com>]
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=20261108064626.5539-1-sowmyatorra@gmail.com \
--to=sowmyatorra@gmail.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=dlemoal@kernel.org \
--cc=johannes.thumshirn@wdc.com \
--cc=julia.lawall@inria.fr \
--cc=julianbraha@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=mkp@kernel.org \
--cc=outreachy@lists.linux.dev \
--cc=rostedt@goodmis.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: 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
all inboxes | Powered by JetHome®