Page MenuHomeFreeBSD
Files F106042062

D13386.diff
No OneTemporary
Actions

D13386.diff
View Options

Index: head/sys/cam/ata/ata_da.c
===================================================================
--- head/sys/cam/ata/ata_da.c
+++ head/sys/cam/ata/ata_da.c
@@ -3354,7 +3354,7 @@
}
#endif
- return(cam_periph_error(ccb, cam_flags, sense_flags, NULL));
+ return(cam_periph_error(ccb, cam_flags, sense_flags));
}
static void
Index: head/sys/cam/ata/ata_pmp.c
===================================================================
--- head/sys/cam/ata/ata_pmp.c
+++ head/sys/cam/ata/ata_pmp.c
@@ -597,7 +597,7 @@
priority = done_ccb->ccb_h.pinfo.priority;
if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
- if (cam_periph_error(done_ccb, 0, 0, NULL) == ERESTART) {
+ if (cam_periph_error(done_ccb, 0, 0) == ERESTART) {
return;
} else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
cam_release_devq(done_ccb->ccb_h.path,
Index: head/sys/cam/ata/ata_xpt.c
===================================================================
--- head/sys/cam/ata/ata_xpt.c
+++ head/sys/cam/ata/ata_xpt.c
@@ -763,8 +763,8 @@
if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
if (cam_periph_error(done_ccb,
- 0, softc->restart ? (SF_NO_RECOVERY | SF_NO_RETRY) : 0,
- NULL) == ERESTART) {
+ 0, softc->restart ? (SF_NO_RECOVERY | SF_NO_RETRY) : 0
+ ) == ERESTART) {
out:
/* Drop freeze taken due to CAM_DEV_QFREEZE flag set. */
cam_release_devq(path, 0, 0, 0, FALSE);
Index: head/sys/cam/cam_periph.h
===================================================================
--- head/sys/cam/cam_periph.h
+++ head/sys/cam/cam_periph.h
@@ -197,7 +197,7 @@
struct timeval* event_time,
u_int duration_ms);
int cam_periph_error(union ccb *ccb, cam_flags camflags,
- u_int32_t sense_flags, union ccb *save_ccb);
+ u_int32_t sense_flags);
static __inline struct mtx *
cam_periph_mtx(struct cam_periph *periph)
Index: head/sys/cam/cam_periph.c
===================================================================
--- head/sys/cam/cam_periph.c
+++ head/sys/cam/cam_periph.c
@@ -1302,7 +1302,7 @@
}
}
if (cam_periph_error(done_ccb,
- 0, SF_RETRY_UA | SF_NO_PRINT, NULL) == ERESTART)
+ 0, SF_RETRY_UA | SF_NO_PRINT) == ERESTART)
goto out;
if (done_ccb->ccb_h.status & CAM_DEV_QFRZN) {
cam_release_devq(done_ccb->ccb_h.path, 0, 0, 0, 0);
@@ -1716,7 +1716,7 @@
*/
int
cam_periph_error(union ccb *ccb, cam_flags camflags,
- u_int32_t sense_flags, union ccb *save_ccb)
+ u_int32_t sense_flags)
{
struct cam_path *newpath;
union ccb *orig_ccb, *scan_ccb;
Index: head/sys/cam/mmc/mmc_da.c
===================================================================
--- head/sys/cam/mmc/mmc_da.c
+++ head/sys/cam/mmc/mmc_da.c
@@ -1425,6 +1425,6 @@
static int
sddaerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags)
{
- return(cam_periph_error(ccb, cam_flags, sense_flags, NULL));
+ return(cam_periph_error(ccb, cam_flags, sense_flags));
}
#endif /* _KERNEL */
Index: head/sys/cam/nvme/nvme_da.c
===================================================================
--- head/sys/cam/nvme/nvme_da.c
+++ head/sys/cam/nvme/nvme_da.c
@@ -407,7 +407,7 @@
xpt_polled_action((union ccb *)&nvmeio);
error = cam_periph_error((union ccb *)&nvmeio,
- 0, SF_NO_RECOVERY | SF_NO_RETRY, NULL);
+ 0, SF_NO_RECOVERY | SF_NO_RETRY);
if ((nvmeio.ccb_h.status & CAM_DEV_QFRZN) != 0)
cam_release_devq(nvmeio.ccb_h.path, /*relsim_flags*/0,
/*reduction*/0, /*timeout*/0, /*getcount_only*/0);
@@ -426,7 +426,7 @@
xpt_polled_action((union ccb *)&nvmeio);
error = cam_periph_error((union ccb *)&nvmeio,
- 0, SF_NO_RECOVERY | SF_NO_RETRY, NULL);
+ 0, SF_NO_RECOVERY | SF_NO_RETRY);
if ((nvmeio.ccb_h.status & CAM_DEV_QFRZN) != 0)
cam_release_devq(nvmeio.ccb_h.path, /*relsim_flags*/0,
/*reduction*/0, /*timeout*/0, /*getcount_only*/0);
@@ -1087,7 +1087,7 @@
break;
}
- return(cam_periph_error(ccb, cam_flags, sense_flags, NULL));
+ return(cam_periph_error(ccb, cam_flags, sense_flags));
}
/*
Index: head/sys/cam/scsi/scsi_cd.c
===================================================================
--- head/sys/cam/scsi/scsi_cd.c
+++ head/sys/cam/scsi/scsi_cd.c
@@ -2593,8 +2593,7 @@
if (softc->quirks & CD_Q_RETRY_BUSY)
sense_flags |= SF_RETRY_BUSY;
- return (cam_periph_error(ccb, cam_flags, sense_flags,
- &softc->saved_ccb));
+ return (cam_periph_error(ccb, cam_flags, sense_flags));
}
static void
Index: head/sys/cam/scsi/scsi_ch.c
===================================================================
--- head/sys/cam/scsi/scsi_ch.c
+++ head/sys/cam/scsi/scsi_ch.c
@@ -752,8 +752,7 @@
periph = xpt_path_periph(ccb->ccb_h.path);
softc = (struct ch_softc *)periph->softc;
- return (cam_periph_error(ccb, cam_flags, sense_flags,
- &softc->saved_ccb));
+ return (cam_periph_error(ccb, cam_flags, sense_flags));
}
static int
Index: head/sys/cam/scsi/scsi_da.c
===================================================================
--- head/sys/cam/scsi/scsi_da.c
+++ head/sys/cam/scsi/scsi_da.c
@@ -1676,7 +1676,7 @@
xpt_polled_action((union ccb *)&csio);
error = cam_periph_error((union ccb *)&csio,
- 0, SF_NO_RECOVERY | SF_NO_RETRY, NULL);
+ 0, SF_NO_RECOVERY | SF_NO_RETRY);
if ((csio.ccb_h.status & CAM_DEV_QFRZN) != 0)
cam_release_devq(csio.ccb_h.path, /*relsim_flags*/0,
/*reduction*/0, /*timeout*/0, /*getcount_only*/0);
@@ -1704,7 +1704,7 @@
xpt_polled_action((union ccb *)&csio);
error = cam_periph_error((union ccb *)&csio,
- 0, SF_NO_RECOVERY | SF_NO_RETRY | SF_QUIET_IR, NULL);
+ 0, SF_NO_RECOVERY | SF_NO_RETRY | SF_QUIET_IR);
if ((csio.ccb_h.status & CAM_DEV_QFRZN) != 0)
cam_release_devq(csio.ccb_h.path, /*relsim_flags*/0,
/*reduction*/0, /*timeout*/0, /*getcount_only*/0);
@@ -5450,8 +5450,7 @@
if (softc->quirks & DA_Q_RETRY_BUSY)
sense_flags |= SF_RETRY_BUSY;
- return(cam_periph_error(ccb, cam_flags, sense_flags,
- &softc->saved_ccb));
+ return(cam_periph_error(ccb, cam_flags, sense_flags));
}
static void
Index: head/sys/cam/scsi/scsi_enc.c
===================================================================
--- head/sys/cam/scsi/scsi_enc.c
+++ head/sys/cam/scsi/scsi_enc.c
@@ -335,7 +335,7 @@
periph = xpt_path_periph(ccb->ccb_h.path);
softc = (struct enc_softc *)periph->softc;
- return (cam_periph_error(ccb, cflags, sflags, &softc->saved_ccb));
+ return (cam_periph_error(ccb, cflags, sflags));
}
static int
Index: head/sys/cam/scsi/scsi_pass.c
===================================================================
--- head/sys/cam/scsi/scsi_pass.c
+++ head/sys/cam/scsi/scsi_pass.c
@@ -2277,6 +2277,5 @@
periph = xpt_path_periph(ccb->ccb_h.path);
softc = (struct pass_softc *)periph->softc;
- return(cam_periph_error(ccb, cam_flags, sense_flags,
- &softc->saved_ccb));
+ return(cam_periph_error(ccb, cam_flags, sense_flags));
}
Index: head/sys/cam/scsi/scsi_pt.c
===================================================================
--- head/sys/cam/scsi/scsi_pt.c
+++ head/sys/cam/scsi/scsi_pt.c
@@ -571,8 +571,7 @@
periph = xpt_path_periph(ccb->ccb_h.path);
softc = (struct pt_softc *)periph->softc;
- return(cam_periph_error(ccb, cam_flags, sense_flags,
- &softc->saved_ccb));
+ return(cam_periph_error(ccb, cam_flags, sense_flags));
}
static int
Index: head/sys/cam/scsi/scsi_sa.c
===================================================================
--- head/sys/cam/scsi/scsi_sa.c
+++ head/sys/cam/scsi/scsi_sa.c
@@ -3469,7 +3469,7 @@
/*
* Otherwise, we let the common code handle this.
*/
- return (cam_periph_error(ccb, cflgs, sflgs, &softc->saved_ccb));
+ return (cam_periph_error(ccb, cflgs, sflgs));
/*
* XXX: To Be Fixed
@@ -3482,7 +3482,7 @@
}
/* FALLTHROUGH */
default:
- return (cam_periph_error(ccb, cflgs, sflgs, &softc->saved_ccb));
+ return (cam_periph_error(ccb, cflgs, sflgs));
}
/*
Index: head/sys/cam/scsi/scsi_sg.c
===================================================================
--- head/sys/cam/scsi/scsi_sg.c
+++ head/sys/cam/scsi/scsi_sg.c
@@ -943,8 +943,7 @@
periph = xpt_path_periph(ccb->ccb_h.path);
softc = (struct sg_softc *)periph->softc;
- return (cam_periph_error(ccb, cam_flags, sense_flags,
- &softc->saved_ccb));
+ return (cam_periph_error(ccb, cam_flags, sense_flags));
}
static void
Index: head/sys/cam/scsi/scsi_xpt.c
===================================================================
--- head/sys/cam/scsi/scsi_xpt.c
+++ head/sys/cam/scsi/scsi_xpt.c
@@ -1180,8 +1180,8 @@
{
if (cam_ccb_status(done_ccb) != CAM_REQ_CMP) {
- if (cam_periph_error(done_ccb, 0,
- SF_NO_PRINT, NULL) == ERESTART) {
+ if (cam_periph_error(done_ccb, 0, SF_NO_PRINT) ==
+ ERESTART) {
outr:
/* Drop freeze taken due to CAM_DEV_QFREEZE */
cam_release_devq(path, 0, 0, 0, FALSE);
@@ -1278,8 +1278,7 @@
} else if (cam_periph_error(done_ccb, 0,
done_ccb->ccb_h.target_lun > 0
? SF_RETRY_UA|SF_QUIET_IR
- : SF_RETRY_UA,
- &softc->saved_ccb) == ERESTART) {
+ : SF_RETRY_UA) == ERESTART) {
goto outr;
} else {
if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
@@ -1321,9 +1320,9 @@
if (cam_ccb_status(done_ccb) != CAM_REQ_CMP) {
if (cam_periph_error(done_ccb, 0,
- done_ccb->ccb_h.target_lun > 0 ?
- SF_RETRY_UA|SF_QUIET_IR : SF_RETRY_UA,
- &softc->saved_ccb) == ERESTART) {
+ done_ccb->ccb_h.target_lun > 0 ?
+ SF_RETRY_UA|SF_QUIET_IR : SF_RETRY_UA) ==
+ ERESTART) {
goto outr;
}
if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
@@ -1427,8 +1426,7 @@
page = (struct scsi_control_page *)offset;
path->device->queue_flags = page->queue_flags;
} else if (cam_periph_error(done_ccb, 0,
- SF_RETRY_UA|SF_NO_PRINT,
- &softc->saved_ccb) == ERESTART) {
+ SF_RETRY_UA|SF_NO_PRINT) == ERESTART) {
goto outr;
} else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
/* Don't wedge the queue */
@@ -1470,8 +1468,7 @@
xpt_schedule(periph, priority);
goto out;
} else if (cam_periph_error(done_ccb, 0,
- SF_RETRY_UA|SF_NO_PRINT,
- &softc->saved_ccb) == ERESTART) {
+ SF_RETRY_UA|SF_NO_PRINT) == ERESTART) {
goto outr;
} else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
/* Don't wedge the queue */
@@ -1515,8 +1512,7 @@
path->device->device_id = (uint8_t *)devid;
}
} else if (cam_periph_error(done_ccb, 0,
- SF_RETRY_UA,
- &softc->saved_ccb) == ERESTART) {
+ SF_RETRY_UA) == ERESTART) {
goto outr;
} else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
/* Don't wedge the queue */
@@ -1558,9 +1554,8 @@
path->device->ext_inq_len = length;
path->device->ext_inq = (uint8_t *)ext_inq;
}
- } else if (cam_periph_error(done_ccb, 0,
- SF_RETRY_UA,
- &softc->saved_ccb) == ERESTART) {
+ } else if (cam_periph_error(done_ccb, 0, SF_RETRY_UA) ==
+ ERESTART) {
goto outr;
} else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
/* Don't wedge the queue */
@@ -1623,8 +1618,7 @@
path->device->serial_num[slen] = '\0';
}
} else if (cam_periph_error(done_ccb, 0,
- SF_RETRY_UA|SF_NO_PRINT,
- &softc->saved_ccb) == ERESTART) {
+ SF_RETRY_UA|SF_NO_PRINT) == ERESTART) {
goto outr;
} else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
/* Don't wedge the queue */
@@ -1693,7 +1687,7 @@
case PROBE_DV_EXIT:
if (cam_ccb_status(done_ccb) != CAM_REQ_CMP) {
cam_periph_error(done_ccb, 0,
- SF_NO_PRINT | SF_NO_RECOVERY | SF_NO_RETRY, NULL);
+ SF_NO_PRINT | SF_NO_RECOVERY | SF_NO_RETRY);
}
if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
/* Don't wedge the queue */
@@ -1744,7 +1738,7 @@
if (cam_ccb_status(done_ccb) != CAM_REQ_CMP) {
cam_periph_error(done_ccb, 0,
- SF_NO_PRINT | SF_NO_RECOVERY | SF_NO_RETRY, NULL);
+ SF_NO_PRINT | SF_NO_RECOVERY | SF_NO_RETRY);
}
if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
/* Don't wedge the queue */

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 25, 9:01 AM (5 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15595953
Default Alt Text
D13386.diff (11 KB)

Event Timeline