lkml.org 
[lkml]   [2015]   [Feb]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 016/152] scsi: correct return values for .eh_abort_handler implementations
    3.2.67-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Hannes Reinecke <hare@suse.de>

    commit b6c92b7e0af575e2b8b05bdf33633cf9e1661cbf upstream.

    The .eh_abort_handler needs to return SUCCESS, FAILED, or
    FAST_IO_FAIL. So fixup all callers to adhere to this requirement.

    Reviewed-by: Robert Elliott <elliott@hp.com>
    Signed-off-by: Hannes Reinecke <hare@suse.de>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    [bwh: Backported to 3.2: drop changes to esas2r]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    --- a/drivers/scsi/NCR5380.c
    +++ b/drivers/scsi/NCR5380.c
    @@ -2662,14 +2662,14 @@ static void NCR5380_dma_complete(NCR5380
    *
    * Purpose : abort a command
    *
    - * Inputs : cmd - the Scsi_Cmnd to abort, code - code to set the
    - * host byte of the result field to, if zero DID_ABORTED is
    + * Inputs : cmd - the Scsi_Cmnd to abort, code - code to set the
    + * host byte of the result field to, if zero DID_ABORTED is
    * used.
    *
    - * Returns : 0 - success, -1 on failure.
    + * Returns : SUCCESS - success, FAILED on failure.
    *
    - * XXX - there is no way to abort the command that is currently
    - * connected, you have to wait for it to complete. If this is
    + * XXX - there is no way to abort the command that is currently
    + * connected, you have to wait for it to complete. If this is
    * a problem, we could implement longjmp() / setjmp(), setjmp()
    * called where the loop started in NCR5380_main().
    *
    @@ -2719,7 +2719,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd
    * aborted flag and get back into our main loop.
    */

    - return 0;
    + return SUCCESS;
    }
    #endif

    --- a/drivers/scsi/aha1740.c
    +++ b/drivers/scsi/aha1740.c
    @@ -551,7 +551,7 @@ static int aha1740_eh_abort_handler (Scs
    * quiet as possible...
    */

    - return 0;
    + return SUCCESS;
    }

    static struct scsi_host_template aha1740_template = {
    --- a/drivers/scsi/atari_NCR5380.c
    +++ b/drivers/scsi/atari_NCR5380.c
    @@ -2638,7 +2638,7 @@ static void NCR5380_reselect(struct Scsi
    * host byte of the result field to, if zero DID_ABORTED is
    * used.
    *
    - * Returns : 0 - success, -1 on failure.
    + * Returns : SUCCESS - success, FAILED on failure.
    *
    * XXX - there is no way to abort the command that is currently
    * connected, you have to wait for it to complete. If this is
    --- a/drivers/scsi/megaraid.c
    +++ b/drivers/scsi/megaraid.c
    @@ -1964,7 +1964,7 @@ megaraid_abort_and_reset(adapter_t *adap
    cmd->device->id, cmd->device->lun);

    if(list_empty(&adapter->pending_list))
    - return FALSE;
    + return FAILED;

    list_for_each_safe(pos, next, &adapter->pending_list) {

    @@ -1987,7 +1987,7 @@ megaraid_abort_and_reset(adapter_t *adap
    (aor==SCB_ABORT) ? "ABORTING":"RESET",
    scb->idx);

    - return FALSE;
    + return FAILED;
    }
    else {

    @@ -2012,12 +2012,12 @@ megaraid_abort_and_reset(adapter_t *adap
    list_add_tail(SCSI_LIST(cmd),
    &adapter->completed_list);

    - return TRUE;
    + return SUCCESS;
    }
    }
    }

    - return FALSE;
    + return FAILED;
    }

    static inline int
    --- a/drivers/scsi/sun3_NCR5380.c
    +++ b/drivers/scsi/sun3_NCR5380.c
    @@ -2624,15 +2624,15 @@ static void NCR5380_reselect (struct Scs
    * Purpose : abort a command
    *
    * Inputs : cmd - the struct scsi_cmnd to abort, code - code to set the
    - * host byte of the result field to, if zero DID_ABORTED is
    + * host byte of the result field to, if zero DID_ABORTED is
    * used.
    *
    - * Returns : 0 - success, -1 on failure.
    + * Returns : SUCCESS - success, FAILED on failure.
    *
    - * XXX - there is no way to abort the command that is currently
    - * connected, you have to wait for it to complete. If this is
    + * XXX - there is no way to abort the command that is currently
    + * connected, you have to wait for it to complete. If this is
    * a problem, we could implement longjmp() / setjmp(), setjmp()
    - * called where the loop started in NCR5380_main().
    + * called where the loop started in NCR5380_main().
    */

    static int NCR5380_abort(struct scsi_cmnd *cmd)


    \
     
     \ /
      Last update: 2015-02-17 04:01    [W:4.032 / U:0.404 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site