d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused 4th argument to match the standard error routines.

Browse Source 
Sponsored by: Netflix
Differential Revision: https://reviews.freebsd.org/D13386
This commit is contained in:
Warner Losh 2017-12-06 00:29:50 +00:00
parent d2f3208dda
commit 553484ae07
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=326606
16 changed files with 36 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/cam/ata/ata_da.c
View File

@ -3354,7 +3354,7 @@ adaerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags)
}
#endif
return(cam_periph_error(ccb, cam_flags, sense_flags, NULL));
return(cam_periph_error(ccb, cam_flags, sense_flags));
}
static void

2
sys/cam/ata/ata_pmp.c
View File

@ -597,7 +597,7 @@ pmpdone(struct cam_periph *periph, union ccb *done_ccb)
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,

4
sys/cam/ata/ata_xpt.c
View File

@ -763,8 +763,8 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
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);

4
sys/cam/cam_periph.c
View File

@ -1302,7 +1302,7 @@ camperiphdone(struct cam_periph *periph, union ccb *done_ccb)
}
}
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 @@ camperiphscsisenseerror(union ccb *ccb, union ccb **orig,
*/
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;

2
sys/cam/cam_periph.h
View File

@ -197,7 +197,7 @@ void cam_periph_freeze_after_event(struct cam_periph *periph,
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)

2
sys/cam/mmc/mmc_da.c
View File

@ -1425,6 +1425,6 @@ sddadone(struct cam_periph *periph, union ccb *done_ccb)
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 */

6
sys/cam/nvme/nvme_da.c
View File

@ -407,7 +407,7 @@ ndadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t len
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 @@ ndadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t len
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 @@ ndaerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags)
break;
}
return(cam_periph_error(ccb, cam_flags, sense_flags, NULL));
return(cam_periph_error(ccb, cam_flags, sense_flags));
}
/*

3
sys/cam/scsi/scsi_cd.c
View File

@ -2593,8 +2593,7 @@ cderror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags)
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

3
sys/cam/scsi/scsi_ch.c
View File

@ -752,8 +752,7 @@ cherror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags)
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

7
sys/cam/scsi/scsi_da.c
View File

@ -1676,7 +1676,7 @@ dadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t leng
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 @@ dadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t leng
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 @@ daerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags)
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

2
sys/cam/scsi/scsi_enc.c
View File

@ -335,7 +335,7 @@ enc_error(union ccb *ccb, uint32_t cflags, uint32_t sflags)
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

3
sys/cam/scsi/scsi_pass.c
View File

@ -2277,6 +2277,5 @@ passerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags)
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));
}

3
sys/cam/scsi/scsi_pt.c
View File

@ -571,8 +571,7 @@ pterror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags)
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

4
sys/cam/scsi/scsi_sa.c
View File

@ -3469,7 +3469,7 @@ saerror(union ccb *ccb, u_int32_t cflgs, u_int32_t sflgs)
/*
* 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 @@ saerror(union ccb *ccb, u_int32_t cflgs, u_int32_t sflgs)
}
/* FALLTHROUGH */
default:
return (cam_periph_error(ccb, cflgs, sflgs, &softc->saved_ccb));
return (cam_periph_error(ccb, cflgs, sflgs));
}
/*

3
sys/cam/scsi/scsi_sg.c
View File

@ -943,8 +943,7 @@ sgerror(union ccb *ccb, uint32_t cam_flags, uint32_t sense_flags)
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

34
sys/cam/scsi/scsi_xpt.c
View File

@ -1180,8 +1180,8 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
{
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 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
} 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 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
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 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
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 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
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 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
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 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
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 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
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 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
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 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
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 */