diff options
Diffstat (limited to 'Documentation/scsi/scsi_eh.txt')
-rw-r--r-- | Documentation/scsi/scsi_eh.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/scsi/scsi_eh.txt b/Documentation/scsi/scsi_eh.txt index 534a50922a7b..331afd791cbb 100644 --- a/Documentation/scsi/scsi_eh.txt +++ b/Documentation/scsi/scsi_eh.txt | |||
@@ -83,11 +83,11 @@ with the command. | |||
83 | The timeout handler is scsi_times_out(). When a timeout occurs, this | 83 | The timeout handler is scsi_times_out(). When a timeout occurs, this |
84 | function | 84 | function |
85 | 85 | ||
86 | 1. invokes optional hostt->eh_timedout() callback. Return value can | 86 | 1. invokes optional hostt->eh_timed_out() callback. Return value can |
87 | be one of | 87 | be one of |
88 | 88 | ||
89 | - EH_HANDLED | 89 | - EH_HANDLED |
90 | This indicates that eh_timedout() dealt with the timeout. The | 90 | This indicates that eh_timed_out() dealt with the timeout. The |
91 | scmd is passed to __scsi_done() and thus linked into per-cpu | 91 | scmd is passed to __scsi_done() and thus linked into per-cpu |
92 | scsi_done_q. Normal command completion described in [1-2-1] | 92 | scsi_done_q. Normal command completion described in [1-2-1] |
93 | follows. | 93 | follows. |
@@ -105,7 +105,7 @@ function | |||
105 | command will time out again. | 105 | command will time out again. |
106 | 106 | ||
107 | - EH_NOT_HANDLED | 107 | - EH_NOT_HANDLED |
108 | This is the same as when eh_timedout() callback doesn't exist. | 108 | This is the same as when eh_timed_out() callback doesn't exist. |
109 | Step #2 is taken. | 109 | Step #2 is taken. |
110 | 110 | ||
111 | 2. scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD) is invoked for the | 111 | 2. scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD) is invoked for the |
@@ -142,7 +142,7 @@ are linked on shost->eh_cmd_q. | |||
142 | Note that this does not mean lower layers are quiescent. If a LLDD | 142 | Note that this does not mean lower layers are quiescent. If a LLDD |
143 | completed a scmd with error status, the LLDD and lower layers are | 143 | completed a scmd with error status, the LLDD and lower layers are |
144 | assumed to forget about the scmd at that point. However, if a scmd | 144 | assumed to forget about the scmd at that point. However, if a scmd |
145 | has timed out, unless hostt->eh_timedout() made lower layers forget | 145 | has timed out, unless hostt->eh_timed_out() made lower layers forget |
146 | about the scmd, which currently no LLDD does, the command is still | 146 | about the scmd, which currently no LLDD does, the command is still |
147 | active as long as lower layers are concerned and completion could | 147 | active as long as lower layers are concerned and completion could |
148 | occur at any time. Of course, all such completions are ignored as the | 148 | occur at any time. Of course, all such completions are ignored as the |