Per Tejun's request, rename the lldd_task field and add comments about it. Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> --- drivers/scsi/libsas/sas_ata.c | 8 ++++---- include/linux/libata.h | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index 2db2589..c92f4b6 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c @@ -122,7 +122,7 @@ static void sas_ata_task_done(struct sas } } - qc->lldd_task = NULL; + qc->driver_data = NULL; if (qc->scsicmd) ASSIGN_SAS_TASK(qc->scsicmd, NULL); ata_qc_complete(qc); @@ -192,7 +192,7 @@ static unsigned int sas_ata_qc_issue(str task->scatter = qc->__sg; task->ata_task.retry_count = 1; task->task_state_flags = SAS_TASK_STATE_PENDING; - qc->lldd_task = task; + qc->driver_data = task; switch (qc->tf.protocol) { case ATA_PROT_NCQ: @@ -276,10 +276,10 @@ static void sas_ata_post_internal(struct * bother with sas_ata_task_done. But we still * ought to abort the task. */ - struct sas_task *task = qc->lldd_task; + struct sas_task *task = qc->driver_data; unsigned long flags; - qc->lldd_task = NULL; + qc->driver_data = NULL; if (task) { /* Should this be a AT(API) device reset? */ spin_lock_irqsave(&task->task_state_lock, flags); diff --git a/include/linux/libata.h b/include/linux/libata.h index a20646c..a8eafc7 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -445,7 +445,9 @@ struct ata_queued_cmd { ata_qc_cb_t complete_fn; void *private_data; - void *lldd_task; + + /* This is owned by a low level libata client */ + void *driver_data; }; struct ata_port_stats { - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html