git: a081a943a0ec - main - cam: drop unused 'saved_ccb' field from softcs

Edward Tomasz Napierala trasz at FreeBSD.org
Tue Jul 6 09:35:20 UTC 2021


The branch main has been updated by trasz:

URL: https://cgit.FreeBSD.org/src/commit/?id=a081a943a0ece20cf4ed28681ec3e01baa94ca2e

commit a081a943a0ece20cf4ed28681ec3e01baa94ca2e
Author:     Edward Tomasz Napierala <trasz at FreeBSD.org>
AuthorDate: 2021-07-06 09:04:09 +0000
Commit:     Edward Tomasz Napierala <trasz at FreeBSD.org>
CommitDate: 2021-07-06 09:04:38 +0000

    cam: drop unused 'saved_ccb' field from softcs
    
    No functional changes.  Do not MFC this, it changes kernel ABI.
    
    Sponsored by:   NetApp, Inc.
    Sponsored by:   Klara, Inc.
    Differential Revision:  https://reviews.freebsd.org/D30698
---
 sys/cam/mmc/mmc_xpt.c            | 1 -
 sys/cam/scsi/scsi_cd.c           | 1 -
 sys/cam/scsi/scsi_ch.c           | 1 -
 sys/cam/scsi/scsi_da.c           | 1 -
 sys/cam/scsi/scsi_enc_internal.h | 1 -
 sys/cam/scsi/scsi_pass.c         | 1 -
 sys/cam/scsi/scsi_pt.c           | 1 -
 sys/cam/scsi/scsi_sa.c           | 1 -
 sys/cam/scsi/scsi_sg.c           | 1 -
 sys/cam/scsi/scsi_xpt.c          | 1 -
 10 files changed, 10 deletions(-)

diff --git a/sys/cam/mmc/mmc_xpt.c b/sys/cam/mmc/mmc_xpt.c
index a649946f096f..6a3ba02acecb 100644
--- a/sys/cam/mmc/mmc_xpt.c
+++ b/sys/cam/mmc/mmc_xpt.c
@@ -176,7 +176,6 @@ CAM_XPT_PROTO(mmc_proto);
 typedef struct {
 	probe_action	action;
 	int             restart;
-	union ccb	saved_ccb;
 	uint32_t	host_ocr;
 	uint32_t	flags;
 #define PROBE_FLAG_ACMD_SENT	0x1 /* CMD55 is sent, card expects ACMD */
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index 91d91a6a8e78..e790b0c89d02 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -164,7 +164,6 @@ struct cd_softc {
 	struct bio_queue_head	bio_queue;
 	LIST_HEAD(, ccb_hdr)	pending_ccbs;
 	struct cd_params	params;
-	union ccb		saved_ccb;
 	cd_quirks		quirks;
 	struct cam_periph	*periph;
 	int			minimum_command_size;
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index 64b0947eaf8d..d440526a7913 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -145,7 +145,6 @@ struct ch_softc {
 	ch_flags	flags;
 	ch_state	state;
 	ch_quirks	quirks;
-	union ccb	saved_ccb;
 	struct devstat	*device_stats;
 	struct cdev     *dev;
 	int		open_count;
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index cf6e2e17e410..ad4c2611333a 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -373,7 +373,6 @@ struct da_softc {
 	int			p_type;
 	struct	 disk_params params;
 	struct	 disk *disk;
-	union	 ccb saved_ccb;
 	struct task		sysctl_task;
 	struct sysctl_ctx_list	sysctl_ctx;
 	struct sysctl_oid	*sysctl_tree;
diff --git a/sys/cam/scsi/scsi_enc_internal.h b/sys/cam/scsi/scsi_enc_internal.h
index ed00dee1578c..61696a89b4ee 100644
--- a/sys/cam/scsi/scsi_enc_internal.h
+++ b/sys/cam/scsi/scsi_enc_internal.h
@@ -143,7 +143,6 @@ struct enc_softc {
 #define	ENC_FLAG_INVALID	0x01
 #define	ENC_FLAG_INITIALIZED	0x02
 #define	ENC_FLAG_SHUTDOWN	0x04
-	union ccb		 saved_ccb;
 	struct cdev		*enc_dev;
 	struct cam_periph	*periph;
 	int			 open_count;
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index 146ff8f26700..e7d9d755c8cc 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -129,7 +129,6 @@ struct pass_softc {
 	pass_state		  state;
 	pass_flags		  flags;
 	u_int8_t		  pd_type;
-	union ccb		  saved_ccb;
 	int			  open_count;
 	u_int		 	  maxio;
 	struct devstat		 *device_stats;
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index 50ac160db6e9..4e7ce9566c59 100644
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -82,7 +82,6 @@ struct pt_softc {
 	LIST_HEAD(, ccb_hdr) pending_ccbs;
 	pt_state state;
 	pt_flags flags;	
-	union	 ccb saved_ccb;
 	int	 io_timeout;
 	struct cdev *dev;
 };
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index 6c7e20df9f6d..d53fd06b2377 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -351,7 +351,6 @@ struct sa_softc {
 	u_int8_t	dsreg;		/* mtio mt_dsreg, redux */
 	int		buffer_mode;
 	int		filemarks;
-	union		ccb saved_ccb;
 	int		last_resid_was_io;
 	uint8_t		density_type_bits[SA_DENSITY_TYPES];
 	int		density_info_valid[SA_DENSITY_TYPES];
diff --git a/sys/cam/scsi/scsi_sg.c b/sys/cam/scsi/scsi_sg.c
index 6b6e65a39f75..c2be014b118b 100644
--- a/sys/cam/scsi/scsi_sg.c
+++ b/sys/cam/scsi/scsi_sg.c
@@ -106,7 +106,6 @@ struct sg_softc {
 	int			sg_timeout;
 	int			sg_user_timeout;
 	uint8_t			pd_type;
-	union ccb		saved_ccb;
 };
 
 static d_open_t		sgopen;
diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c
index b88e1869b880..6b77d50b25c3 100644
--- a/sys/cam/scsi/scsi_xpt.c
+++ b/sys/cam/scsi/scsi_xpt.c
@@ -189,7 +189,6 @@ typedef enum {
 typedef struct {
 	TAILQ_HEAD(, ccb_hdr) request_ccbs;
 	probe_action	action;
-	union ccb	saved_ccb;
 	probe_flags	flags;
 	MD5_CTX		context;
 	u_int8_t	digest[16];


More information about the dev-commits-src-all mailing list