sd: use consistant printk prefixes

Index: scsi-misc-2.6/drivers/scsi/sd.c
===================================================================
@@ -298,7 +298,8 @@
 	 */
 	if (sdp->sector_size == 1024) {
 		if ((block & 1) || (rq->nr_sectors & 1)) {
-			printk(KERN_ERR "sd: Bad block number requested");
+			printk(KERN_ERR "%s: Bad block number requested",
+					disk->disk_name);
 			return 0;
 		} else {
 			block = block >> 1;

@@ -307,7 +308,8 @@
 	}
 	if (sdp->sector_size == 2048) {
 		if ((block & 3) || (rq->nr_sectors & 3)) {
-			printk(KERN_ERR "sd: Bad block number requested");
+			printk(KERN_ERR "%s: Bad block number requested",
+					disk->disk_name);
 			return 0;
 		} else {
 			block = block >> 2;

@@ -316,7 +318,8 @@
 	}
 	if (sdp->sector_size == 4096) {
 		if ((block & 7) || (rq->nr_sectors & 7)) {
-			printk(KERN_ERR "sd: Bad block number requested");
+			printk(KERN_ERR "%s: Bad block number requested",
+					disk->disk_name);
 			return 0;
 		} else {
 			block = block >> 3;

@@ -333,7 +336,8 @@
 		SCpnt->cmnd[0] = READ_6;
 		SCpnt->sc_data_direction = DMA_FROM_DEVICE;
 	} else {
-		printk(KERN_ERR "sd: Unknown command %lx\n", rq->flags);
+		printk(KERN_ERR "%s: Unknown command %lx\n",
+				disk->disk_name, rq->flags);
 /* overkill 	panic("Unknown sd command %lx\n", rq->flags); */
 		return 0;
 	}

@@ -703,7 +707,8 @@
 			break;
 	}
 
-	if (res) {		printk(KERN_WARNING "FAILED\n  status = %x, message = %02x, "
+	if (res) {
+		printk(KERN_WARNING "FAILED\n  status = %x, message = %02x, "
 				    "host = %d, driver = %02x\n  ",
 				    status_byte(res), msg_byte(res),
 				    host_byte(res), driver_byte(res));

@@ -1267,8 +1272,7 @@
 		mb -= sz - 974;
 		sector_div(mb, 1950);
 
-		printk(KERN_NOTICE "SCSI device %s: "
-		       "%llu %d-byte hdwr sectors (%llu MB)\n",
+		printk(KERN_NOTICE "%s: %llu %d-byte hdwr sectors (%llu MB)\n",
 		       diskname, (unsigned long long)sdkp->capacity,
 		       hard_sector, (unsigned long long)mb);
 	}

@@ -1429,9 +1433,8 @@
 
 		ct =  sdkp->RCD + 2*sdkp->WCE;
 
-		printk(KERN_NOTICE "SCSI device %s: drive cache: %s\n",
+		printk(KERN_NOTICE "%s: drive cache: %s\n",
 		       diskname, types[ct]);
-
 		return;
 	}
 

@@ -1688,7 +1691,7 @@
 		return;         /* this can happen */
 
 	if (sdkp->WCE) {
-		printk(KERN_NOTICE "Synchronizing SCSI cache for disk %s: \n",
+		printk(KERN_NOTICE "%s: Synchronizing disk cache\n",
 				sdkp->disk->disk_name);
 		sd_sync_cache(sdp);
 	}

index 930db39..c5c8436 100644
@@ -230,23 +230,22 @@ static void scsi_disk_put(struct scsi_di
  *
  *	Returns 1 if successful and 0 if error (or cannot be done now).
  **/
-static int sd_init_command(struct scsi_cmnd * SCpnt)
+static int sd_init_command(struct scsi_cmnd *SCpnt)
 {
 	struct scsi_device *sdp = SCpnt->device;
 	struct request *rq = SCpnt->request;
 	struct gendisk *disk = rq->rq_disk;
 	sector_t block = rq->sector;
 	unsigned int this_count = SCpnt->request_bufflen >> 9;
-	unsigned int timeout = sdp->timeout;
 
 	SCSI_LOG_HLQUEUE(1, printk("sd_init_command: disk=%s, block=%llu, "
-			    "count=%d\n", disk->disk_name,
-			 (unsigned long long)block, this_count));
+				   "count=%d\n", disk->disk_name,
+				   (unsigned long long)block, this_count));
 
 	if (!sdp || !scsi_device_online(sdp) ||
  	    block + rq->nr_sectors > get_capacity(disk)) {
 		SCSI_LOG_HLQUEUE(2, printk("Finishing %ld sectors\n", 
-				 rq->nr_sectors));
+					   rq->nr_sectors));
 		SCSI_LOG_HLQUEUE(2, printk("Retry with 0x%p\n", SCpnt));
 		return 0;
 	}

@@ -263,8 +262,8 @@ static int sd_init_command(struct scsi_c
 				   disk->disk_name, (unsigned long long)block));
 
 	/*
-	 * If we have a 1K hardware sectorsize, prevent access to single
-	 * 512 byte sectors.  In theory we could handle this - in fact
+	 * If we have a 1K, 2K, or 4K hardware sectorsize, prevent access
+	 * to smaller sectors.  In theory we could handle this - in fact
 	 * the scsi cdrom driver must be able to handle this because
 	 * we typically use 1K blocksizes, and cdroms typically have
 	 * 2K hardware sectorsizes.  Of course, things are simpler

@@ -274,50 +273,41 @@ static int sd_init_command(struct scsi_c
 	 * for this.
 	 */
 	if (sdp->sector_size == 1024) {
-		if ((block & 1) || (rq->nr_sectors & 1)) {
-			printk(KERN_ERR "sd: Bad block number requested");
-			return 0;
-		} else {
-			block = block >> 1;
-			this_count = this_count >> 1;
-		}
-	}
-	if (sdp->sector_size == 2048) {
-		if ((block & 3) || (rq->nr_sectors & 3)) {
-			printk(KERN_ERR "sd: Bad block number requested");
-			return 0;
-		} else {
-			block = block >> 2;
-			this_count = this_count >> 2;
-		}
-	}
-	if (sdp->sector_size == 4096) {
-		if ((block & 7) || (rq->nr_sectors & 7)) {
-			printk(KERN_ERR "sd: Bad block number requested");
-			return 0;
-		} else {
-			block = block >> 3;
-			this_count = this_count >> 3;
-		}
+		if ((block & 1) || (rq->nr_sectors & 1))
+			goto bad_block;
+		block = block >> 1;
+		this_count = this_count >> 1;
+	}
+	else if (sdp->sector_size == 2048) {
+		if ((block & 3) || (rq->nr_sectors & 3))
+			goto bad_block;
+		block = block >> 2;
+		this_count = this_count >> 2;
+	}
+	else if (sdp->sector_size == 4096) {
+		if ((block & 7) || (rq->nr_sectors & 7))
+			goto bad_block;
+		block = block >> 3;
+		this_count = this_count >> 3;
 	}
 	if (rq_data_dir(rq) == WRITE) {
-		if (!sdp->writeable) {
+		if (!sdp->writeable)
 			return 0;
-		}
 		SCpnt->cmnd[0] = WRITE_6;
 		SCpnt->sc_data_direction = DMA_TO_DEVICE;
 	} else if (rq_data_dir(rq) == READ) {
 		SCpnt->cmnd[0] = READ_6;
 		SCpnt->sc_data_direction = DMA_FROM_DEVICE;
 	} else {
-		printk(KERN_ERR "sd: Unknown command %lx\n", rq->flags);
+		printk(KERN_ERR "%s: Unknown command %lx\n", disk->disk_name, rq->flags);
 /* overkill 	panic("Unknown sd command %lx\n", rq->flags); */
 		return 0;
 	}
 
 	SCSI_LOG_HLQUEUE(2, printk("%s : %s %d/%ld 512 byte blocks.\n", 
-		disk->disk_name, (rq_data_dir(rq) == WRITE) ? 
-		"writing" : "reading", this_count, rq->nr_sectors));
+				   disk->disk_name,
+				   (rq_data_dir(rq) == WRITE) ? "writing" : "reading",
+				   this_count, rq->nr_sectors));
 
 	SCpnt->cmnd[1] = 0;
 	

@@ -359,7 +349,8 @@ static int sd_init_command(struct scsi_c
 			 * during operation and thus turned off
 			 * use_10_for_rw.
 			 */
-			printk(KERN_ERR "sd: FUA write on READ/WRITE(6) drive\n");
+			printk(KERN_ERR "%s: FUA write on READ/WRITE(6) drive\n",
+			       disk->disk_name);
 			return 0;
 		}
 

@@ -380,7 +371,7 @@ static int sd_init_command(struct scsi_c
 	SCpnt->transfersize = sdp->sector_size;
 	SCpnt->underflow = this_count << 9;
 	SCpnt->allowed = SD_MAX_RETRIES;
-	SCpnt->timeout_per_command = timeout;
+	SCpnt->timeout_per_command = sdp->timeout;
 
 	/*
 	 * This is the completion routine we use.  This is matched in terms

@@ -393,6 +384,11 @@ static int sd_init_command(struct scsi_c
 	 * queued.
 	 */
 	return 1;
+
+bad_block:
+	printk(KERN_ERR "%s: Bad block number requested: %llu (sector size: %d, sector: %lu)\n",
+	       disk->disk_name, (unsigned long long)block, sdp->sector_size, rq->nr_sectors);
+	return 0;
 }
 
 /**

@@ -679,12 +675,13 @@ static int sd_sync_cache(struct scsi_dev
 			break;
 	}
 
-	if (res) {		printk(KERN_WARNING "FAILED\n  status = %x, message = %02x, "
-				    "host = %d, driver = %02x\n  ",
-				    status_byte(res), msg_byte(res),
-				    host_byte(res), driver_byte(res));
-			if (driver_byte(res) & DRIVER_SENSE)
-				scsi_print_sense_hdr("sd", &sshdr);
+	if (res) {
+		printk(KERN_WARNING "FAILED\n  status = %x, message = %02x, "
+		       "host = %d, driver = %02x\n  ",
+		       status_byte(res), msg_byte(res),
+		       host_byte(res), driver_byte(res));
+		if (driver_byte(res) & DRIVER_SENSE)
+			scsi_print_sense_hdr("sd", &sshdr);
 	}
 
 	return res;