sas_ata.c (39795d6534c6e698c4f9c065e0a5f4a2e5af7543) sas_ata.c (d188e5db9d274db4c183861438f883c1d74b0f16)
1/*
2 * Support for SATA devices on Serial Attached SCSI (SAS) controllers
3 *
4 * Copyright (C) 2006 IBM Corporation
5 *
6 * Written by: Darrick J. Wong <djwong@us.ibm.com>, IBM Corporation
7 *
8 * This program is free software; you can redistribute it and/or

--- 361 unchanged lines hidden (view full) ---

370 va_list args;
371 int r;
372
373 va_start(args, fmt);
374
375 vaf.fmt = fmt;
376 vaf.va = &args;
377
1/*
2 * Support for SATA devices on Serial Attached SCSI (SAS) controllers
3 *
4 * Copyright (C) 2006 IBM Corporation
5 *
6 * Written by: Darrick J. Wong <djwong@us.ibm.com>, IBM Corporation
7 *
8 * This program is free software; you can redistribute it and/or

--- 361 unchanged lines hidden (view full) ---

370 va_list args;
371 int r;
372
373 va_start(args, fmt);
374
375 vaf.fmt = fmt;
376 vaf.va = &args;
377
378 r = printk("%ssas: ata%u: %s: %pV",
378 r = printk("%s" SAS_FMT "ata%u: %s: %pV",
379 level, ap->print_id, dev_name(dev), &vaf);
380
381 va_end(args);
382
383 return r;
384}
385
386static int sas_ata_hard_reset(struct ata_link *link, unsigned int *class,

--- 209 unchanged lines hidden (view full) ---

596
597void sas_ata_task_abort(struct sas_task *task)
598{
599 struct ata_queued_cmd *qc = task->uldd_task;
600 struct completion *waiting;
601
602 /* Bounce SCSI-initiated commands to the SCSI EH */
603 if (qc->scsicmd) {
379 level, ap->print_id, dev_name(dev), &vaf);
380
381 va_end(args);
382
383 return r;
384}
385
386static int sas_ata_hard_reset(struct ata_link *link, unsigned int *class,

--- 209 unchanged lines hidden (view full) ---

596
597void sas_ata_task_abort(struct sas_task *task)
598{
599 struct ata_queued_cmd *qc = task->uldd_task;
600 struct completion *waiting;
601
602 /* Bounce SCSI-initiated commands to the SCSI EH */
603 if (qc->scsicmd) {
604 struct request_queue *q = qc->scsicmd->device->request_queue;
605 unsigned long flags;
606
607 spin_lock_irqsave(q->queue_lock, flags);
604 blk_abort_request(qc->scsicmd->request);
608 blk_abort_request(qc->scsicmd->request);
609 spin_unlock_irqrestore(q->queue_lock, flags);
605 return;
606 }
607
608 /* Internal command, fake a timeout and complete. */
609 qc->flags &= ~ATA_QCFLAG_ACTIVE;
610 qc->flags |= ATA_QCFLAG_FAILED;
611 qc->err_mask |= AC_ERR_TIMEOUT;
612 waiting = qc->private_data;

--- 257 unchanged lines hidden --- 		610 return;
611 }
612
613 /* Internal command, fake a timeout and complete. */
614 qc->flags &= ~ATA_QCFLAG_ACTIVE;
615 qc->flags |= ATA_QCFLAG_FAILED;
616 qc->err_mask |= AC_ERR_TIMEOUT;
617 waiting = qc->private_data;

--- 257 unchanged lines hidden ---