lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] libata: make the owner of a qc responsible for freeing it

Browse Source 
qc used to be freed automatically on command completion.  However, as
a qc can carry information about its completion status, it can be
useful to its owner/issuer after command completion.  This patch makes
freeing qc responsibility of its owner.  This simplifies
ata_exec_internal() and makes command turn-around for atapi request
sensing less hackish.

This change was originally suggested by Jeff Garzik.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Tejun Heo
2006-01-23 13:09:36 +09:00
committed by Jeff Garzik
parent 4ba946e9d8
commit 77853bf2b4
3 changed files with 21 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/scsi/libata-core.c
View File

@ -1072,24 +1072,12 @@ static unsigned int ata_pio_modes(const struct ata_device *adev)
timing API will get this right anyway */
}
struct ata_exec_internal_arg {
unsigned int err_mask;
struct ata_taskfile *tf;
struct completion *waiting;
};
int ata_qc_complete_internal(struct ata_queued_cmd *qc)
void ata_qc_complete_internal(struct ata_queued_cmd *qc)
{
struct ata_exec_internal_arg *arg = qc->private_data;
struct completion *waiting = arg->waiting;
struct completion *waiting = qc->private_data;
if (!(qc->err_mask & ~AC_ERR_DEV))
qc->ap->ops->tf_read(qc->ap, arg->tf);
arg->err_mask = qc->err_mask;
arg->waiting = NULL;
qc->ap->ops->tf_read(qc->ap, &qc->tf);
complete(waiting);
return 0;
}
/**
@ -1120,7 +1108,7 @@ ata_exec_internal(struct ata_port *ap, struct ata_device *dev,
struct ata_queued_cmd *qc;
DECLARE_COMPLETION(wait);
unsigned long flags;
struct ata_exec_internal_arg arg;
unsigned int err_mask;
spin_lock_irqsave(&ap->host_set->lock, flags);
@ -1134,9 +1122,7 @@ ata_exec_internal(struct ata_port *ap, struct ata_device *dev,
qc->nsect = buflen / ATA_SECT_SIZE;
}
arg.waiting = &wait;
arg.tf = tf;
qc->private_data = &arg;
qc->private_data = &wait;
qc->complete_fn = ata_qc_complete_internal;
if (ata_qc_issue(qc))
@ -1153,7 +1139,7 @@ ata_exec_internal(struct ata_port *ap, struct ata_device *dev,
* before the caller cleans up, it will result in a
* spurious interrupt. We can live with that.
*/
if (arg.waiting) {
if (qc->flags & ATA_QCFLAG_ACTIVE) {
qc->err_mask = AC_ERR_OTHER;
ata_qc_complete(qc);
printk(KERN_WARNING "ata%u: qc timeout (cmd 0x%x)\n",
@ -1163,7 +1149,12 @@ ata_exec_internal(struct ata_port *ap, struct ata_device *dev,
spin_unlock_irqrestore(&ap->host_set->lock, flags);
}
return arg.err_mask;
*tf = qc->tf;
err_mask = qc->err_mask;
ata_qc_free(qc);
return err_mask;
issue_fail:
ata_qc_free(qc);
@ -3633,8 +3624,6 @@ void ata_qc_free(struct ata_queued_cmd *qc)
void ata_qc_complete(struct ata_queued_cmd *qc)
{
int rc;
assert(qc != NULL); /* ata_qc_from_tag _might_ return NULL */
assert(qc->flags & ATA_QCFLAG_ACTIVE);
@ -3648,17 +3637,7 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
qc->flags &= ~ATA_QCFLAG_ACTIVE;
/* call completion callback */
rc = qc->complete_fn(qc);
/* if callback indicates not to complete command (non-zero),
* return immediately
*/
if (rc != 0)
return;
ata_qc_free(qc);
VPRINTK("EXIT\n");
qc->complete_fn(qc);
}
static inline int ata_should_dma_map(struct ata_queued_cmd *qc)