sd: Make revalidate less chatty
sd_revalidate ends up being called several times during device setup. With this patch we print everything during the first scan. Subsequent invocations will only print a message if the parameter in question has actually changed (LUN capacity has increased, etc.).
Signed-off-by Martin K. Petersen <[email protected]>
---
drivers/scsi/sd.c +34 -21
@@ -1356,6 +1356,7 @@ sd_read_capacity(struct scsi_disk *sdkp,struct scsi_sense_hdr sshdr;int sense_valid =0 ;struct scsi_device *sdp = sdkp->device; +sector_t old_capacity = sdkp->capacity; repeat: retries =3 ;
@@ -1512,10 +1513,12 @@ got_data: mb -= sz -974 ;sector_div (mb,1950 ); -sd_printk (KERN_NOTICE , sdkp, -"%llu %d-byte hardware sectors (%llu MB)\n" , - (unsigned long long )sdkp->capacity, - hard_sector, (unsigned long long )mb); +/* Only print first time and if capacity changes */ +if (sdkp->verbose || old_capacity != sdkp->capacity) +sd_printk (KERN_NOTICE , sdkp, +"%llu %d-byte hardware sectors (%llu MB)\n" , + (unsigned long long )sdkp->capacity, + hard_sector, (unsigned long long )mb); }/* Rescale capacity to 512-byte units */
@@ -1552,6 +1555,7 @@ sd_read_write_protect_flag(struct scsi_dint res;struct scsi_device *sdp = sdkp->device;struct scsi_mode_data data; +int old_wp = sdkp->write_prot;set_disk_ro (sdkp->disk,0 );if (sdp->skip_ms_page_3f) {
@@ -1592,8 +1596,9 @@ sd_read_write_protect_flag(struct scsi_d }else { sdkp->write_prot = ((data.device_specific &0x80 ) !=0 );set_disk_ro (sdkp->disk, sdkp->write_prot); -sd_printk (KERN_NOTICE , sdkp,"Write Protect is %s\n" , - sdkp->write_prot ?"on" :"off" ); +if (sdkp->verbose || old_wp != sdkp->write_prot) +sd_printk (KERN_NOTICE , sdkp,"Write Protect is %s\n" , + sdkp->write_prot ?"on" :"off" );sd_printk (KERN_DEBUG , sdkp,"Mode Sense: %02x %02x %02x %02x\n" , buffer[0 ], buffer[1 ], buffer[2 ], buffer[3 ]);
@@ -1614,6 +1619,9 @@ sd_read_cache_type(struct scsi_disk *sdkint modepage;struct scsi_mode_data data;struct scsi_sense_hdr sshdr; +int old_wce = sdkp->WCE; +int old_rcd = sdkp->RCD; +int old_dpofua = sdkp->DPOFUA;if (sdp->skip_ms_page_8) goto defaults;
@@ -1685,12 +1693,14 @@ sd_read_cache_type(struct scsi_disk *sdk sdkp->DPOFUA =0 ; } -sd_printk (KERN_NOTICE , sdkp, -"Write cache: %s, read cache: %s, %s\n" , - sdkp->WCE ?"enabled" :"disabled" , - sdkp->RCD ?"disabled" :"enabled" , - sdkp->DPOFUA ?"supports DPO and FUA" - :"doesn't support DPO or FUA" ); +if (sdkp->verbose || old_wce != sdkp->WCE || + old_rcd != sdkp->RCD || old_dpofua != sdkp->DPOFUA) +sd_printk (KERN_NOTICE , sdkp, +"Write cache: %s, read cache: %s, %s\n" , + sdkp->WCE ?"enabled" :"disabled" , + sdkp->RCD ?"disabled" :"enabled" , + sdkp->DPOFUA ?"supports DPO and FUA" + :"doesn't support DPO or FUA" );return ; }
@@ -1786,15 +1796,6 @@ static int sd_revalidate_disk(struct gen goto out; } -/* defaults, until the device tells us otherwise */ - sdp->sector_size =512 ; - sdkp->capacity =0 ; - sdkp->media_present =1 ; - sdkp->write_prot =0 ; - sdkp->WCE =0 ; - sdkp->RCD =0 ; - sdkp->ATO =0 ; -sd_spinup_disk (sdkp);/*
@@ -1807,6 +1808,8 @@ static int sd_revalidate_disk(struct gensd_read_cache_type (sdkp, buffer);sd_read_app_tag_own (sdkp, buffer); } + + sdkp->verbose =0 ;/* * We now have all cache related info, determine how we deal
@@ -1929,6 +1932,16 @@ static int sd_probe(struct device *dev) gd->private_data = &sdkp->driver; gd->queue = sdkp->device->request_queue; + +/* defaults, until the device tells us otherwise */ + sdp->sector_size =512 ; + sdkp->capacity =0 ; + sdkp->media_present =1 ; + sdkp->write_prot =0 ; + sdkp->WCE =0 ; + sdkp->RCD =0 ; + sdkp->ATO =0 ; + sdkp->verbose =1 ;sd_revalidate_disk (gd);
drivers/scsi/sd.h +1 -0
@@ -53,6 +53,7 @@ struct scsi_disk { unsigned WCE : 1; /* state of disk WCE bit */ unsigned RCD : 1; /* state of disk RCD bit, unused */ unsigned DPOFUA : 1; /* state of disk DPOFUA bit */ + unsigned verbose : 1; };#define to_scsi_disk (obj) container_of(obj,struct scsi_disk,dev)