Page MenuHomeFreeBSD

D30698.id91863.diff
No OneTemporary

D30698.id91863.diff

diff --git a/sys/cam/mmc/mmc_xpt.c b/sys/cam/mmc/mmc_xpt.c
--- a/sys/cam/mmc/mmc_xpt.c
+++ b/sys/cam/mmc/mmc_xpt.c
@@ -176,7 +176,6 @@
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
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -164,7 +164,6 @@
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
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -145,7 +145,6 @@
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
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -373,7 +373,6 @@
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
--- a/sys/cam/scsi/scsi_enc_internal.h
+++ b/sys/cam/scsi/scsi_enc_internal.h
@@ -143,7 +143,6 @@
#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
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -129,7 +129,6 @@
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
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -82,7 +82,6 @@
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
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -351,7 +351,6 @@
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
--- a/sys/cam/scsi/scsi_sg.c
+++ b/sys/cam/scsi/scsi_sg.c
@@ -106,7 +106,6 @@
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
--- a/sys/cam/scsi/scsi_xpt.c
+++ b/sys/cam/scsi/scsi_xpt.c
@@ -189,7 +189,6 @@
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];

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 27, 6:12 PM (3 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16203330
Default Alt Text
D30698.id91863.diff (3 KB)

Event Timeline