From: Nao Nishijima <nao.nishijima.xt@hitachi.com>
To: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org
Cc: James.Bottomley@HansenPartnership.com, kay.sievers@vrfy.org,
jcm@redhat.com, greg@kroah.com,
dle-develop@lists.sourceforge.net,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
yrl.pp-manager.tt@hitachi.com, dgilbert@interlog.com,
stefanr@s5r6.in-berlin.de, hare@suse.de,
Nao Nishijima <nao.nishijima.xt@hitachi.com>
Subject: [RFC PATCH 4/4] sd: cleanup for alias name
Date: Fri, 08 Jul 2011 17:46:26 +0900 [thread overview]
Message-ID: <20110708084626.2091.29632.stgit@ltc197.sdl.hitachi.co.jp> (raw)
In-Reply-To: <20110708084547.2091.55262.stgit@ltc197.sdl.hitachi.co.jp>
Use sd_printk() instead of printk().
Signed-off-by: Nao Nishijima <nao.nishijima.xt@hitachi.com>
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
drivers/scsi/sd.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 953773c..e434e5f 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1066,12 +1066,13 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode,
unsigned int cmd, unsigned long arg)
{
struct gendisk *disk = bdev->bd_disk;
- struct scsi_device *sdp = scsi_disk(disk)->device;
+ struct scsi_disk *sdkp = scsi_disk(disk);
+ struct scsi_device *sdp = sdkp->device;
void __user *p = (void __user *)arg;
int error;
- SCSI_LOG_IOCTL(1, printk("sd_ioctl: disk=%s, cmd=0x%x\n",
- disk->disk_name, cmd));
+ SCSI_LOG_IOCTL(1, sd_printk(KERN_INFO, sdkp, "sd_ioctl: disk=%s,"
+ " cmd=0x%x\n", disk->disk_name, cmd));
/*
* If we are in the middle of error recovery, don't let anyone
next prev parent reply other threads:[~2011-07-08 8:46 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-08 8:45 [RFC PATCH 0/4] Persistent device name using " Nao Nishijima
2011-07-08 8:46 ` [RFC PATCH 1/4] block: add a new attribute "alias name" in gendisk structure Nao Nishijima
2011-07-08 8:46 ` [RFC PATCH 2/4] sd: modify printk for alias_name Nao Nishijima
2011-07-09 5:42 ` [PATCH] scsi: Make functions out of logging macros Joe Perches
2011-07-09 13:32 ` Nao Nishijima
2011-07-08 8:46 ` [RFC PATCH 3/4] fs: modify disk_name() for alias name Nao Nishijima
2011-07-08 8:46 ` Nao Nishijima [this message]
2011-07-08 14:54 ` [RFC PATCH 0/4] Persistent device name using " Greg KH
2011-07-08 15:41 ` Kay Sievers
2011-07-08 15:47 ` Greg KH
2011-07-08 15:54 ` James Bottomley
2011-07-08 16:04 ` Greg KH
2011-07-08 16:17 ` James Bottomley
2011-07-08 16:32 ` Greg KH
2011-07-08 16:15 ` Kay Sievers
2011-07-08 16:38 ` Kay Sievers
2011-07-11 11:47 ` Hannes Reinecke
2011-07-09 6:11 ` Masami Hiramatsu
2011-08-03 17:16 ` Borislav Petkov
2011-08-10 2:01 ` Masami Hiramatsu
2011-07-08 19:45 ` Karel Zak
2011-07-08 19:58 ` Greg KH
2011-07-15 6:55 ` Nao Nishijima
2011-07-15 12:48 ` Karel Zak
2011-07-16 11:40 ` Nao Nishijima
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=20110708084626.2091.29632.stgit@ltc197.sdl.hitachi.co.jp \
--to=nao.nishijima.xt@hitachi.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=dgilbert@interlog.com \
--cc=dle-develop@lists.sourceforge.net \
--cc=greg@kroah.com \
--cc=hare@suse.de \
--cc=jcm@redhat.com \
--cc=kay.sievers@vrfy.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=stefanr@s5r6.in-berlin.de \
--cc=yrl.pp-manager.tt@hitachi.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®