D44424.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D44424.diff
View Options

	diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c
	--- a/sys/dev/mpi3mr/mpi3mr.c
	+++ b/sys/dev/mpi3mr/mpi3mr.c
	@@ -5692,6 +5692,8 @@
	if (cmd->callout_owner) {
	ccb = (union ccb *)(cmd->ccb);
	ccb->ccb_h.status = CAM_SCSI_BUS_RESET;
	+ mpi3mr_atomic_dec(&sc->fw_outstanding);
	+ mpi3mr_atomic_dec(&cmd->targ->outstanding);
	mpi3mr_cmd_done(sc, cmd);
	} else {
	cmd->ccb = NULL;
	diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c
	--- a/sys/dev/mpi3mr/mpi3mr_cam.c
	+++ b/sys/dev/mpi3mr/mpi3mr_cam.c
	@@ -1802,7 +1802,6 @@

	int mpi3mr_remove_device_from_os(struct mpi3mr_softc *sc, U16 handle)
	{
	- U32 i = 0;
	int retval = 0;
	struct mpi3mr_target *target;

	@@ -1833,17 +1832,6 @@
	target->per_id);
	}

	- while (mpi3mr_atomic_read(&target->outstanding) && (i < 30)) {
	- i++;
	- if (!(i % 2)) {
	- mpi3mr_dprint(sc, MPI3MR_INFO,
	- "[%2d]waiting for "
	- "waiting for outstanding commands to complete on target: %d\n",
	- i, target->per_id);
	- }
	- DELAY(1000 * 1000);
	- }
	-
	if (target->exposed_to_os && !sc->reset_in_progress) {
	mpi3mr_rescan_target(sc, target);
	mpi3mr_dprint(sc, MPI3MR_INFO,