Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 255
b: refs/heads/master
c: 686579d
h: refs/heads/master
i:
  253: b4869d8
  251: 813175d
  247: a3f62d4
  239: 9b04e93
  223: 57b7ebc
  191: 07f108b
  127: 638136b
v: v3
  • Loading branch information
unknown authored and James Bottomley committed Apr 17, 2005
1 parent 8fa6146 commit 6267268
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 91bbfbda8d41f834c70c47d6f8c95245c90019e5
refs/heads/master: 686579d95d48c713bdb7008cc76af8398219e687
3 changes: 3 additions & 0 deletions trunk/drivers/scsi/scsi_error.c
Original file line number Diff line number Diff line change
Expand Up @@ -1306,6 +1306,9 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
case DID_IMM_RETRY:
return NEEDS_RETRY;

case DID_REQUEUE:
return ADD_TO_MLQUEUE;

case DID_ERROR:
if (msg_byte(scmd->result) == COMMAND_COMPLETE &&
status_byte(scmd->result) == RESERVATION_CONFLICT)
Expand Down
2 changes: 2 additions & 0 deletions trunk/include/scsi/scsi.h
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,8 @@ struct scsi_lun {
#define DID_PASSTHROUGH 0x0a /* Force command past mid-layer */
#define DID_SOFT_ERROR 0x0b /* The low level driver just wish a retry */
#define DID_IMM_RETRY 0x0c /* Retry without decrementing retry count */
#define DID_REQUEUE 0x0d /* Requeue command (no immediate retry) also
* without decrementing the retry count */
#define DRIVER_OK 0x00 /* Driver status */

/*
Expand Down

0 comments on commit 6267268

Please sign in to comment.