Replace assert() with WARN_ON in drivers/scsi/libata-core.c
PATCH 1/1 Replace assert() with WARN_ON in drivers/scsi/libata-core.c
Replace assert() with WARN_ON in drivers/scsi/libata-core.c
This is my first patch to the kernel - this work was suggested by Jeff Garzik as a janitorial task for libata. If I could get some feedback letting me know that this is the correct format and my tools are setup right, I'll do the rest of these.
---
drivers/scsi/libata-core.c | 46 ++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 23 deletions(-)
drivers/scsi/libata-core.c +23 -23
@@ -1251,8 +1251,8 @@ static void ata_dev_identify(struct ata_DPRINTK ("ENTER, host %u, dev %u\n" , ap->id, device); -assert (dev->class ==ATA_DEV_ATA || dev->class ==ATA_DEV_ATAPI || - dev->class ==ATA_DEV_NONE ); +WARN_ON (dev->class !=ATA_DEV_ATA &&&dev->class !=ATA_DEV_ATAPI && + dev->class !=ATA_DEV_NONE );ata_dev_select (ap, device,1 ,1 );/* select device 0/1 */
@@ -2264,7 +2264,7 @@ static unsigned int ata_get_mode_mask(co master = &ap->device[0 ]; slave = &ap->device[1 ]; -assert (ata_dev_present (master) ||ata_dev_present (slave)); +WARN_ON (!ata_dev_present (master) && !ata_dev_present (slave));if (shift ==ATA_SHIFT_UDMA ) { mask = ap->udma_mask;
@@ -2510,11 +2510,11 @@ static void ata_sg_clean(struct ata_queuint dir = qc->dma_dir;void *pad_buf =NULL ; -assert (qc->flags &ATA_QCFLAG_DMAMAP ); -assert (sg !=NULL ); +WARN_ON (~qc->flags &ATA_QCFLAG_DMAMAP ); +WARN_ON (sg ==NULL );if (qc->flags &ATA_QCFLAG_SINGLE ) -assert (qc->n_elem ==1 ); +WARN_ON (qc->n_elem !=1 );VPRINTK ("unmapping %u sg elements\n" , qc->n_elem);
@@ -2569,8 +2569,8 @@ static void ata_fill_sg(struct ata_queuestruct scatterlist *sg;unsigned int idx; -assert (qc->__sg !=NULL ); -assert (qc->n_elem >0 ); +WARN_ON (qc->__sg ==NULL ); +WARN_ON (qc->n_elem <=0 ); idx =0 ;ata_for_each_sg (sg, qc) {
@@ -2722,7 +2722,7 @@ static int ata_sg_setup_one(struct ata_qvoid *pad_buf = ap->pad + (qc->tag *ATA_DMA_PAD_SZ );struct scatterlist *psg = &qc->pad_sgent; -assert (qc->dev->class ==ATA_DEV_ATAPI ); +WARN_ON (qc->dev->class !=ATA_DEV_ATAPI );memset (pad_buf,0 ,ATA_DMA_PAD_SZ );
@@ -2784,7 +2784,7 @@ static int ata_sg_setup(struct ata_queueint n_elem, pre_n_elem, dir, trim_sg =0 ;VPRINTK ("ENTER, ata%u\n" , ap->id); -assert (qc->flags &ATA_QCFLAG_SG ); +WARN_ON (~qc->flags &ATA_QCFLAG_SG );/* we must lengthen transfers to end on a 32-bit boundary */ qc->pad_len = lsg->length &3 ;
@@ -2793,7 +2793,7 @@ static int ata_sg_setup(struct ata_queuestruct scatterlist *psg = &qc->pad_sgent;unsigned int offset; -assert (qc->dev->class ==ATA_DEV_ATAPI ); +WARN_ON (qc->dev->class !=ATA_DEV_ATAPI );memset (pad_buf,0 ,ATA_DMA_PAD_SZ );
@@ -2887,7 +2887,7 @@ static unsigned long ata_pio_poll(structunsigned int reg_state =HSM_ST_UNKNOWN ; qc =ata_qc_from_tag (ap, ap->active_tag); -assert (qc !=NULL ); +WARN_ON (qc ==NULL );switch (ap->hsm_task_state) {case HSM_ST :
@@ -2955,7 +2955,7 @@ static int ata_pio_complete (struct ata_ } qc =ata_qc_from_tag (ap, ap->active_tag); -assert (qc !=NULL ); +WARN_ON (qc ==NULL ); drv_stat =ata_wait_idle (ap);if (!ata_ok (drv_stat)) {
@@ -2966,7 +2966,7 @@ static int ata_pio_complete (struct ata_ ap->hsm_task_state =HSM_ST_IDLE ; -assert (qc->err_mask ==0 ); +WARN_ON (qc->err_mask !=0 );ata_poll_qc_complete (qc);/* another command may start at this point */
@@ -3323,7 +3323,7 @@ static void ata_pio_block(struct ata_por } qc =ata_qc_from_tag (ap, ap->active_tag); -assert (qc !=NULL ); +WARN_ON (qc ==NULL );/* check error */ if (status & (ATA_ERR |ATA_DF )) {
@@ -3360,12 +3360,12 @@ static void ata_pio_error(struct ata_porprintk (KERN_WARNING "ata%u: PIO error\n" , ap->id); qc =ata_qc_from_tag (ap, ap->active_tag); -assert (qc !=NULL ); +WARN_ON (qc ==NULL );/* make sure qc->err_mask is available to * know what's wrong and recover */ -assert (qc->err_mask); +WARN_ON (qc->err_mask ==0 ); ap->hsm_task_state =HSM_ST_IDLE ;
@@ -3598,7 +3598,7 @@ static void __ata_qc_complete(struct ata*/ void ata_qc_free (struct ata_queued_cmd *qc) { -assert (qc !=NULL );/* ata_qc_from_tag _might_ return NULL */ +WARN_ON (qc ==NULL );/* ata_qc_from_tag _might_ return NULL */ __ata_qc_complete (qc); }
@@ -3619,8 +3619,8 @@ void ata_qc_complete(struct ata_queued_c {int rc; -assert (qc !=NULL );/* ata_qc_from_tag _might_ return NULL */ -assert (qc->flags &ATA_QCFLAG_ACTIVE ); +WARN_ON (qc ==NULL );/* ata_qc_from_tag _might_ return NULL */ +WARN_ON (~qc->flags &ATA_QCFLAG_ACTIVE );if (likely (qc->flags &ATA_QCFLAG_DMAMAP ))ata_sg_clean (qc);
@@ -4160,8 +4160,8 @@ static void atapi_packet_task(void *_datu8 status; qc =ata_qc_from_tag (ap, ap->active_tag); -assert (qc !=NULL ); -assert (qc->flags &ATA_QCFLAG_ACTIVE ); +WARN_ON (qc ==NULL ); +WARN_ON (~qc->flags &ATA_QCFLAG_ACTIVE );/* sleep-wait for BSY to clear */ DPRINTK ("busy wait\n" );
@@ -4179,7 +4179,7 @@ static void atapi_packet_task(void *_dat/* send SCSI cdb */ DPRINTK ("send cdb\n" ); -assert (ap->cdb_len >=12 ); +WARN_ON (ap->cdb_len <12 );if (qc->tf.protocol ==ATA_PROT_ATAPI_DMA || qc->tf.protocol ==ATA_PROT_ATAPI_NODATA ) {
Quoted 9 lines · Aubin LaBrosse
Replace
assert()withWARN_ONindrivers/scsi/libata-core.cThis is my first patch to the kernel - this work was suggested by Jeff Garzik as a janitorial task for libata. If I could get some feedback letting me know that this is the correct format and my tools are setup right, I'll do the rest of these.
Signed-off-by Aubin LaBrosse <[email protected]>---
drivers/scsi/libata-core.c | 46 ++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 23 deletions(-)
Someone already beat you to it :)
I looked over your patch anyway. It looks acceptable, except we avoid the '~' style in such tests:
+ WARN_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
+ WARN_ON(~qc->flags & ATA_QCFLAG_ACTIVE);
Jeff
Quoted 17 lines · Jeff Garzik
Quoted 10 lines · Aubin LaBrosse
Replace
assert()withWARN_ONindrivers/scsi/libata-core.cThis is my first patch to the kernel - this work was suggested by Jeff Garzik as a janitorial task for libata. If I could get some feedback letting me know that this is the correct format and my tools are setup right, I'll do the rest of these.
Signed-off-by Aubin LaBrosse <[email protected]>---
drivers/scsi/libata-core.c | 46 ++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 23 deletions(-)Someone already beat you to it :)
I looked over your patch anyway. It looks acceptable, except we avoid the '~' style in such tests:
drivers/scsi/libata-core.c void ata_qc_complete(struct ata_queued_c
Quoted 4 lines
drivers/scsi/libata-core.c +2
-0+WARN_ON (qc ==NULL );/* ata_qc_from_tag _might_ return NULL */ +WARN_ON (~qc->flags &ATA_QCFLAG_ACTIVE ); Jeff
So what would be the proper way to invert that type of test? (!(field & flag)) will do the same, right? is that preferred for anything other than aesthetic reasons? (which is a fine reason to prefer something, of course, I'm just wondering if there's any other reasons, performance or otherwise
-aubin
begin:vcard
fn:Aubin LaBrosse
n:LaBrosse;Aubin
email;internet:[email protected]
tel;work:589-0692
tel;home:429-1520
tel;cell:493-0121
version:2.1
end:vcard
Quoted 6 lines · Aubin LaBrosse
Replace
assert()withWARN_ONindrivers/scsi/libata-core.cThis is my first patch to the kernel - this work was suggested by Jeff Garzik as a janitorial task for libata. If I could get some feedback letting me know that this is the correct format and my tools are setup right, I'll do the rest of these.
Signed-off-by Aubin LaBrosse <[email protected]>
Jeff wrote an email a couple of days ago that he already has several of these patches...
drivers/scsi/libata-core.c static void ata_dev_identify(struct ata_ · line 1255
Quoted 8 lines
drivers/scsi/libata-core.c +2
-2@@ -1251,8 +1251,8 @@ static void ata_dev_identify(struct ata_DPRINTK ("ENTER, host %u, dev %u\n" , ap->id, device); -assert (dev->class ==ATA_DEV_ATA || dev->class ==ATA_DEV_ATAPI || - dev->class ==ATA_DEV_NONE ); +WARN_ON (dev->class !=ATA_DEV_ATA &&&dev->class !=ATA_DEV_ATAPI && + dev->class !=ATA_DEV_NONE );
Does that one compile cleanly?
drivers/scsi/libata-core.c static void ata_dev_identify(struct ata_ · line 1258
Quoted 3 lines
drivers/scsi/libata-core.c +0
-0ata_dev_select (ap, device,1 ,1 );/* select device 0/1 */
Otherwise it looks pretty good to me.
Signature · 1 line
~Randy
Quoted 27 lines · Randy.Dunlap
Quoted 6 lines · Aubin LaBrosse
Replace
assert()withWARN_ONindrivers/scsi/libata-core.cThis is my first patch to the kernel - this work was suggested by Jeff Garzik as a janitorial task for libata. If I could get some feedback letting me know that this is the correct format and my tools are setup right, I'll do the rest of these.
Signed-off-by Aubin LaBrosse <[email protected]>Jeff wrote an email a couple of days ago that he already has several of these patches...
drivers/scsi/libata-core.c static void ata_dev_identify(struct ata_ · line 1256
Quoted 9 lines
drivers/scsi/libata-core.c +2
-2@@ -1251,8 +1251,8 @@ static void ata_dev_identify(struct ata_DPRINTK ("ENTER, host %u, dev %u\n" , ap->id, device); -assert (dev->class ==ATA_DEV_ATA || dev->class ==ATA_DEV_ATAPI || - dev->class ==ATA_DEV_NONE ); +WARN_ON (dev->class !=ATA_DEV_ATA &&&dev->class !=ATA_DEV_ATAPI && + dev->class !=ATA_DEV_NONE );Does that one compile cleanly?
Quoted 7 lines
drivers/scsi/libata-core.c static void ata_dev_identify(struct ata_ · line 1258
Quoted 3 lines
drivers/scsi/libata-core.c +0
-0ata_dev_select (ap, device,1 ,1 );/* select device 0/1 */ Otherwise it looks pretty good to me.
Oops. I guess it wouldn't have compiled. :( I was so fixated on getting the tools to work right I didn't even try. thanks for the feedback, even if someone beat me to it. guess i'll go check out kernelnewbies for other janitorial type stuff to work on (and won't forget to compile and boot-test my patches, sorry!)
-aubin
begin:vcard
fn:Aubin LaBrosse
n:LaBrosse;Aubin
email;internet:[email protected]
tel;work:589-0692
tel;home:429-1520
tel;cell:493-0121
version:2.1
end:vcard