lkml.org 
[lkml]   [2013]   [Jan]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[v2.6.34-stable 37/77] Silencing 'killing requests for dead queue'
    Date
    From: Hannes Reinecke <hare@suse.de>

    -------------------
    This is a commit scheduled for the next v2.6.34 longterm release.
    http://git.kernel.org/?p=linux/kernel/git/paulg/longterm-queue-2.6.34.git
    If you see a problem with using this for longterm, please comment.
    -------------------

    commit 745718132c3c7cac98a622b610e239dcd5217f71 upstream.

    When we tear down a device we try to flush all outstanding
    commands in scsi_free_queue(). However the check in
    scsi_request_fn() is imperfect as it only signals that
    we _might start_ aborting commands, not that we've actually
    aborted some.
    So move the printk inside the scsi_kill_request function,
    this will also give us a hint about which commands are aborted.

    Signed-off-by: Hannes Reinecke <hare@suse.de>
    Signed-off-by: James Bottomley <JBottomley@Parallels.com>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    drivers/scsi/scsi_lib.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
    index 9f240f4..ca8666b 100644
    --- a/drivers/scsi/scsi_lib.c
    +++ b/drivers/scsi/scsi_lib.c
    @@ -1383,6 +1383,8 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
    BUG();
    }

    + scmd_printk(KERN_INFO, cmd, "killing request\n");
    +
    sdev = cmd->device;
    starget = scsi_target(sdev);
    shost = sdev->host;
    @@ -1469,7 +1471,6 @@ static void scsi_request_fn(struct request_queue *q)
    struct request *req;

    if (!sdev) {
    - printk("scsi: killing requests for dead queue\n");
    while ((req = blk_peek_request(q)) != NULL)
    scsi_kill_request(req, q);
    return;
    --
    1.7.12.1


    \
     
     \ /
      Last update: 2013-01-09 01:21    [W:2.489 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site