lkml.org 
[lkml]   [2008]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 03/18] ide-cd: cdrom_decode_status: factor out block pc error handling code
    Date
    From
    ... into cdrom_handle_failed_pc_req().

    There should be no functionality change resulting from this patch.

    Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
    ---
    drivers/ide/ide-cd.c | 81 +++++++++++++++++++++++++++----------------------
    1 files changed, 45 insertions(+), 36 deletions(-)

    diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
    index 2f0c9d4..16c4ce9 100644
    --- a/drivers/ide/ide-cd.c
    +++ b/drivers/ide/ide-cd.c
    @@ -273,6 +273,48 @@ static void ide_dump_status_no_sense(ide_drive_t *drive, const char *msg, u8 st)
    ide_dump_status(drive, msg, st);
    }

    +/* All other functions, except for READ. */
    +static int cdrom_handle_failed_pc_req(ide_drive_t *drive, struct request *rq,
    + int sense_key, int stat)
    +{
    + /*
    + * if we have an error, pass back CHECK_CONDITION as the scsi status
    + * byte
    + */
    + if (blk_pc_request(rq) && !rq->errors)
    + rq->errors = SAM_STAT_CHECK_CONDITION;
    +
    + /* check for tray open */
    + if (sense_key == NOT_READY) {
    + cdrom_saw_media_change(drive);
    + } else if (sense_key == UNIT_ATTENTION) {
    + /* check for media change */
    + cdrom_saw_media_change(drive);
    + return 0;
    + } else if (sense_key == ILLEGAL_REQUEST &&
    + rq->cmd[0] == GPCMD_START_STOP_UNIT) {
    +
    + /*
    + * Don't print error message for this condition - SFF8090i
    + * indicates that 5/24/00 is the correct response to a request
    + * to close the tray if the drive doesn't have that capability.
    + * cdrom_log_sense() knows this!
    + */
    + } else if (!(rq->cmd_flags & REQ_QUIET)) {
    + /* otherwise, print an error */
    + ide_dump_status(drive, "packet command error", stat);
    + }
    +
    + rq->cmd_flags |= REQ_FAILED;
    +
    + /* instead of playing games with moving completions around, remove
    + * failed request completely and end it when the request sense has
    + * completed.
    + */
    + return 1;
    +}
    +
    +
    /*
    * Returns:
    * 0: if the request should be continued.
    @@ -314,44 +356,11 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
    return 1;

    } else if (blk_pc_request(rq) || rq->cmd_type == REQ_TYPE_ATA_PC) {
    - /* All other functions, except for READ. */

    - /*
    - * if we have an error, pass back CHECK_CONDITION as the
    - * scsi status byte
    - */
    - if (blk_pc_request(rq) && !rq->errors)
    - rq->errors = SAM_STAT_CHECK_CONDITION;
    -
    - /* check for tray open */
    - if (sense_key == NOT_READY) {
    - cdrom_saw_media_change(drive);
    - } else if (sense_key == UNIT_ATTENTION) {
    - /* check for media change */
    - cdrom_saw_media_change(drive);
    + if (cdrom_handle_failed_pc_req(drive, rq, sense_key, stat))
    + goto end_request;
    + else
    return 0;
    - } else if (sense_key == ILLEGAL_REQUEST &&
    - rq->cmd[0] == GPCMD_START_STOP_UNIT) {
    - /*
    - * Don't print error message for this condition--
    - * SFF8090i indicates that 5/24/00 is the correct
    - * response to a request to close the tray if the
    - * drive doesn't have that capability.
    - * cdrom_log_sense() knows this!
    - */
    - } else if (!(rq->cmd_flags & REQ_QUIET)) {
    - /* otherwise, print an error */
    - ide_dump_status(drive, "packet command error", stat);
    - }
    -
    - rq->cmd_flags |= REQ_FAILED;
    -
    - /*
    - * instead of playing games with moving completions around,
    - * remove failed request completely and end it when the
    - * request sense has completed
    - */
    - goto end_request;

    } else if (blk_fs_request(rq)) {
    int do_end_request = 0;
    --
    1.5.5.1


    \
     
     \ /
      Last update: 2008-06-12 08:45    [W:0.025 / U:0.092 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site