patch-2.4.26 linux-2.4.26/drivers/block/cciss_scsi.c

• Lines: 17
• Date: 2004-04-14 06:05:29.000000000 -0700
• Orig file: linux-2.4.25/drivers/block/cciss_scsi.c
• Orig date: 2003-11-28 10:26:19.000000000 -0800

diff -urN linux-2.4.25/drivers/block/cciss_scsi.c linux-2.4.26/drivers/block/cciss_scsi.c
@@ -589,6 +589,8 @@
 
 	for(i=0; i<num_luns; i++) {
 		/* Execute an inquiry to figure the device type */
+		/* Skip over masked devices */
+		if (ld_buff->LUN[i][3] & 0xC0) continue;
 		memset(inq_buff, 0, sizeof(InquiryData_struct));
 		memcpy(scsi3addr, ld_buff->LUN[i], 8); /* ugly... */
 		return_code = sendcmd(CISS_INQUIRY, cntl_num, inq_buff,
@@ -1148,6 +1150,7 @@
 		int devtype;
 
 		/* for each physical lun, do an inquiry */
+		if (ld_buff->LUN[i][3] & 0xC0) continue;
 		memset(inq_buff, 0, sizeof(InquiryData_struct));
 		memcpy(&scsi3addr[0], &ld_buff->LUN[i][0], 8);