From: Christoph Hellwig <hch@lst.de>
To: jejb@steeleye.com
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] sd: use consistant printk prefixes
Date: Fri, 6 Jan 2006 18:00:20 +0100 [thread overview]
Message-ID: <20060106170020.GA22994@lst.de> (raw)
Always use the gendisk name as prink prefix as we already do in most
places. This makes the messages a lot more readable, especially during
bootup where sd is quite verbose.
Index: scsi-misc-2.6/drivers/scsi/sd.c
===================================================================
--- scsi-misc-2.6.orig/drivers/scsi/sd.c 2005-12-16 16:14:35.000000000 +0100
+++ scsi-misc-2.6/drivers/scsi/sd.c 2006-01-06 17:52:58.000000000 +0100
@@ -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);
}
next reply other threads:[~2006-01-06 17:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-06 17:00 Christoph Hellwig [this message]
[not found] ` <1136589393.15460.20.camel@localhost>
[not found] ` <20060107140658.GB9342@lst.de>
[not found] ` <1136655773.15460.28.camel@localhost>
[not found] ` <20060115181012.GA16187@lst.de>
2006-01-15 18:58 ` [PATCH] sd: use consistant printk prefixes Joe Perches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060106170020.GA22994@lst.de \
--to=hch@lst.de \
--cc=jejb@steeleye.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.