projects/linux·commit d11d9b2d

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

d11d9b2d · Linus Torvalds <[email protected]> · 2006-03-06 18:47:07 -08:00

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/srp: Don't send task management commands after target removal
Commit
d11d9b2dd2c43dd99a491df8a83ae28401db0044
Parents
15730ddb · 1285b3a0

Merge commit. Changes below are compared with the first parent: 15730ddb.

Changes

1 files changed · +6 −0

FileStatusAddDelContent
drivers/infiniband/ulp/srp/ib_srp.cmodified+6−0View file

drivers/infiniband/ulp/srp/ib_srp.c

View file
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 2d2d4ac..960dae5 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -1155,6 +1155,12 @@ static int srp_send_tsk_mgmt(struct scsi_cmnd *scmnd, u8 func)
spin_lock_irq(target->scsi_host->host_lock);
+ if (target->state == SRP_TARGET_DEAD ||
+ target->state == SRP_TARGET_REMOVED) {
+ scmnd->result = DID_BAD_TARGET << 16;
+ goto out;
+ }
+
if (scmnd->host_scribble == (void *) -1L)
goto out;