lkml.org 
[lkml]   [2011]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[033/165] SATA: enable non-queueable flush flag
    2.6.39-stable review patch.  If anyone has any objections, please let us know.

    ------------------
    Content-Length: 1988
    Lines: 66

    From: "shaohua.li@intel.com" <shaohua.li@intel.com>

    commit 900e599eb0c16390ff671652a44e0ea90532220e upstream.

    Enable non-queueable flush flag for SATA.

    Stable: 2.6.39 only

    Signed-off-by: Shaohua Li <shaohua.li@intel.com>
    Acked-by: Tejun Heo <tj@kernel.org>
    Acked-by: Jeff Garzik <jgarzik@redhat.com>
    Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/ata/libata-scsi.c | 13 +++++++------
    1 file changed, 7 insertions(+), 6 deletions(-)

    --- a/drivers/ata/libata-scsi.c
    +++ b/drivers/ata/libata-scsi.c
    @@ -1089,21 +1089,21 @@ static int atapi_drain_needed(struct req
    static int ata_scsi_dev_config(struct scsi_device *sdev,
    struct ata_device *dev)
    {
    + struct request_queue *q = sdev->request_queue;
    +
    if (!ata_id_has_unload(dev->id))
    dev->flags |= ATA_DFLAG_NO_UNLOAD;

    /* configure max sectors */
    - blk_queue_max_hw_sectors(sdev->request_queue, dev->max_sectors);
    + blk_queue_max_hw_sectors(q, dev->max_sectors);

    if (dev->class == ATA_DEV_ATAPI) {
    - struct request_queue *q = sdev->request_queue;
    void *buf;

    sdev->sector_size = ATA_SECT_SIZE;

    /* set DMA padding */
    - blk_queue_update_dma_pad(sdev->request_queue,
    - ATA_DMA_PAD_SZ - 1);
    + blk_queue_update_dma_pad(q, ATA_DMA_PAD_SZ - 1);

    /* configure draining */
    buf = kmalloc(ATAPI_MAX_DRAIN, q->bounce_gfp | GFP_KERNEL);
    @@ -1131,8 +1131,7 @@ static int ata_scsi_dev_config(struct sc
    "sector_size=%u > PAGE_SIZE, PIO may malfunction\n",
    sdev->sector_size);

    - blk_queue_update_dma_alignment(sdev->request_queue,
    - sdev->sector_size - 1);
    + blk_queue_update_dma_alignment(q, sdev->sector_size - 1);

    if (dev->flags & ATA_DFLAG_AN)
    set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events);
    @@ -1145,6 +1144,8 @@ static int ata_scsi_dev_config(struct sc
    scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, depth);
    }

    + blk_queue_flush_queueable(q, false);
    +
    dev->sdev = sdev;
    return 0;
    }



    \
     
     \ /
      Last update: 2011-06-01 10:59    [W:0.020 / U:131.072 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site