cciss regression: firmware version not displayed in procfs
Subsystems (2)
Patch 2 of 1
This patch fixes another regression introduced by commit 6ae5ce8e8d4de666f31286808d2285aa6a50fa40. The fiwmware version is no longer being displayed in procfs. Please consider this for inclusion.
Signed-off-by Mike Miller <[email protected]>
drivers/block/cciss.c +21 -0
@@ -1631,6 +1632,7 @@ static int rebuild_lun_table(ctlr_info_t *h, int first_time)int ctlr = h->ctlr;int num_luns;ReportLunData_struct *ld_buff =NULL ; +InquiryData_struct *inq_buff =NULL ;int return_code;int listlength =0 ;int i;
@@ -1651,6 +1653,26 @@ static int rebuild_lun_table(ctlr_info_t *h, int first_time) h->busy_configuring =1 ;spin_unlock_irqrestore (CCISS_LOCK (h->ctlr), flags); + inq_buff =kzalloc (sizeof (InquiryData_struct),GFP_KERNEL ); +if (inq_buff ==NULL ) { +printk (KERN_ERR "cciss: out of memory\n" ); +return ENOMEM ; + } + +/* Get the firmware version */ + return_code =sendcmd_withirq (CISS_INQUIRY , ctlr, inq_buff, +sizeof (InquiryData_struct),0 ,0 ,0 ,TYPE_CMD ); +if (return_code ==IO_OK ) { + h->firm_ver[0 ] = inq_buff->data_byte[32 ]; + h->firm_ver[1 ] = inq_buff->data_byte[33 ]; + h->firm_ver[2 ] = inq_buff->data_byte[34 ]; + h->firm_ver[3 ] = inq_buff->data_byte[35 ]; + }else {/* send command failed */ +printk (KERN_WARNING "cciss: unable to determine firmware" +" version of controller\n" ); + } + +/* Get the number of logical volumes */ ld_buff =kzalloc (sizeof (ReportLunData_struct),GFP_KERNEL );if (ld_buff ==NULL ) goto mem_msg;