From: Hannes Reinecke <hare@suse.de>
To: James Bottomley <jbottomley@parallels.com>
Cc: Christoph Hellwig <hch@infradead.org>,
linux-scsi@vger.kernel.org, Robert Elliott <elliott@hp.com>,
Hannes Reinecke <hare@suse.de>,
stable@vger.kernel.org
Subject: [PATCH 26/26] scsi: correct return values for .eh_abort_handler implementations
Date: Tue, 7 Oct 2014 11:03:25 +0200 [thread overview]
Message-ID: <1412672605-42868-27-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1412672605-42868-1-git-send-email-hare@suse.de>
The .eh_abort_handler needs to return SUCCESS, FAILED, or
FAST_IO_FAIL. So fixup all callers to adhere to this requirement.
Cc: Robert Elliott <elliott@hp.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/NCR5380.c | 2 +-
drivers/scsi/aha1740.c | 2 +-
drivers/scsi/esas2r/esas2r_main.c | 2 +-
drivers/scsi/megaraid.c | 8 ++++----
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 50873bb..e2c9e73 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -2703,7 +2703,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) {
* aborted flag and get back into our main loop.
*/
- return 0;
+ return SUCCESS;
}
#endif
diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
index 5f31017..31ace4b 100644
--- a/drivers/scsi/aha1740.c
+++ b/drivers/scsi/aha1740.c
@@ -531,7 +531,7 @@ static int aha1740_eh_abort_handler (Scsi_Cmnd *dummy)
* quiet as possible...
*/
- return 0;
+ return SUCCESS;
}
static struct scsi_host_template aha1740_template = {
diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r_main.c
index 6504a19..45aa684 100644
--- a/drivers/scsi/esas2r/esas2r_main.c
+++ b/drivers/scsi/esas2r/esas2r_main.c
@@ -1057,7 +1057,7 @@ int esas2r_eh_abort(struct scsi_cmnd *cmd)
cmd->scsi_done(cmd);
- return 0;
+ return SUCCESS;
}
spin_lock_irqsave(&a->queue_lock, flags);
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index ac5d94c..2485255 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -1945,7 +1945,7 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
cmd->device->id, (u32)cmd->device->lun);
if(list_empty(&adapter->pending_list))
- return FALSE;
+ return FAILED;
list_for_each_safe(pos, next, &adapter->pending_list) {
@@ -1968,7 +1968,7 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
(aor==SCB_ABORT) ? "ABORTING":"RESET",
scb->idx);
- return FALSE;
+ return FAILED;
}
else {
@@ -1993,12 +1993,12 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
list_add_tail(SCSI_LIST(cmd),
&adapter->completed_list);
- return TRUE;
+ return SUCCESS;
}
}
}
- return FALSE;
+ return FAILED;
}
static inline int
--
1.8.5.2
next prev parent reply other threads:[~2014-10-07 9:03 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-07 9:02 [PATCHv7 00/26] scsi logging update (the boring part) Hannes Reinecke
2014-10-07 9:03 ` [PATCH 01/26] Remove scsi_cmd_print_sense_hdr() Hannes Reinecke
2014-10-07 9:03 ` [PATCH 02/26] sd: Remove scsi_print_sense() in sd_done() Hannes Reinecke
2014-10-07 9:03 ` [PATCH 03/26] aha152x: Debug output update and whitespace cleanup Hannes Reinecke
2014-10-07 9:03 ` [PATCH 04/26] scsi: introduce sdev_prefix_printk() Hannes Reinecke
2014-10-07 9:03 ` [PATCH 05/26] scsi: Use sdev as argument for sense code printing Hannes Reinecke
2014-10-07 9:03 ` [PATCH 06/26] acornscsi: use scsi_print_command() Hannes Reinecke
2014-10-07 9:03 ` [PATCH 07/26] fas216: Return DID_ERROR for incomplete data transfer Hannes Reinecke
2014-10-07 9:03 ` [PATCH 08/26] fas216: Update logging messages Hannes Reinecke
2014-10-07 9:03 ` [PATCH 09/26] 53c700: remove scsi_print_sense() usage Hannes Reinecke
2014-10-07 9:03 ` [PATCH 10/26] scsi: stop decoding if scsi_normalize_sense() fails Hannes Reinecke
2014-10-07 9:03 ` [PATCH 11/26] scsi: do not decode sense extras Hannes Reinecke
2014-10-07 9:03 ` [PATCH 12/26] scsi: use 'bool' as return value for scsi_normalize_sense() Hannes Reinecke
2014-10-07 9:03 ` [PATCH 13/26] scsi: remove scsi_print_status() Hannes Reinecke
2014-10-07 9:03 ` [PATCH 14/26] Implement scsi_opcode_sa_name Hannes Reinecke
2014-10-07 9:03 ` [PATCH 15/26] scsi: merge print_opcode_name() Hannes Reinecke
2014-10-07 9:03 ` [PATCH 16/26] scsi: consolidate opcode lookup in scsi_opcode_sa_name() Hannes Reinecke
2014-10-07 9:03 ` [PATCH 17/26] scsi: repurpose the last argument from print_opcode_name() Hannes Reinecke
2014-10-07 9:03 ` [PATCH 18/26] scsi: Remove scsi_print_command when calling abort Hannes Reinecke
2014-10-07 9:03 ` [PATCH 19/26] scsi: separate out scsi_(host|driver)byte_string() Hannes Reinecke
2014-10-07 9:03 ` [PATCH 20/26] sd: Cleanup logging Hannes Reinecke
2014-10-07 9:03 ` [PATCH 21/26] scsi: simplify scsi_log_(send|completion) Hannes Reinecke
2014-10-08 20:41 ` Elliott, Robert (Server Storage)
2014-10-15 13:10 ` Hannes Reinecke
2014-10-07 9:03 ` [PATCH 22/26] scsi: fixup logging messages in scsi_error.c Hannes Reinecke
2014-10-07 9:03 ` [PATCH 23/26] scsi: use shost argument in scsi_eh_prt_fail_stats Hannes Reinecke
2014-10-07 9:03 ` [PATCH 24/26] scsi_error: document scsi_try_to_abort_cmd Hannes Reinecke
2014-10-07 9:03 ` [PATCH 25/26] scsi: check for correct return code in scsi_eh_abort_cmds() Hannes Reinecke
2014-10-07 9:03 ` Hannes Reinecke [this message]
2014-10-07 19:52 ` [PATCHv7 00/26] scsi logging update (the boring part) Ewan Milne
-- strict thread matches above, loose matches on Subject: below --
2014-10-06 9:01 [PATCHv6 " Hannes Reinecke
2014-10-06 9:01 ` [PATCH 26/26] scsi: correct return values for .eh_abort_handler implementations Hannes Reinecke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1412672605-42868-27-git-send-email-hare@suse.de \
--to=hare@suse.de \
--cc=elliott@hp.com \
--cc=hch@infradead.org \
--cc=jbottomley@parallels.com \
--cc=linux-scsi@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox