From 9ed03d56b4878629693d2f88ce91622d0391d5e8 Mon Sep 17 00:00:00 2001
From: WANG Cong <amwang@redhat.com>
Date: Fri, 19 Aug 2011 14:48:28 +0200
Subject: [PATCH] --- yaml --- r: 273823 b: refs/heads/master c:
 5eedf5415cd57f8db8642a5db4cf8e5507390030 h: refs/heads/master i:   273821:
 f37dd3e223546518ffaa6d5fcc982c8dc42fcab0   273819:
 d8bb6db52cc016779b878e1ecb4f567619bb9f24   273815:
 8b293a26940ddcb5991a4a959accf5cd40e11c39   273807:
 f78d240958d78d7432774bc8663f1cefea7e9736   273791:
 5ff68f31b3ff646092c3e070ebe6fd8755d1fb2f v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/block/nbd.c | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 8b8817bd6d00..d3444ff815cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7742ce4ab49976851ce7f0185dcbe491935371a2
+refs/heads/master: 5eedf5415cd57f8db8642a5db4cf8e5507390030
diff --git a/trunk/drivers/block/nbd.c b/trunk/drivers/block/nbd.c
index 2b5fc11be377..3353d98f81d6 100644
--- a/trunk/drivers/block/nbd.c
+++ b/trunk/drivers/block/nbd.c
@@ -127,8 +127,7 @@ static void sock_shutdown(struct nbd_device *lo, int lock)
 	if (lock)
 		mutex_lock(&lo->tx_lock);
 	if (lo->sock) {
-		printk(KERN_WARNING "%s: shutting down socket\n",
-			lo->disk->disk_name);
+		dev_warn(disk_to_dev(lo->disk), "shutting down socket\n");
 		kernel_sock_shutdown(lo->sock, SHUT_RDWR);
 		lo->sock = NULL;
 	}
@@ -576,7 +575,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo,
 	case NBD_DISCONNECT: {
 		struct request sreq;
 
-	        printk(KERN_INFO "%s: NBD_DISCONNECT\n", lo->disk->disk_name);
+	        dev_info(disk_to_dev(lo->disk), "NBD_DISCONNECT\n");
 
 		blk_rq_init(NULL, &sreq);
 		sreq.cmd_type = REQ_TYPE_SPECIAL;
@@ -674,7 +673,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo,
 		file = lo->file;
 		lo->file = NULL;
 		nbd_clear_que(lo);
-		printk(KERN_WARNING "%s: queue cleared\n", lo->disk->disk_name);
+		dev_warn(disk_to_dev(lo->disk), "queue cleared\n");
 		if (file)
 			fput(file);
 		lo->bytesize = 0;
@@ -694,8 +693,8 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo,
 		return 0;
 
 	case NBD_PRINT_DEBUG:
-		printk(KERN_INFO "%s: next = %p, prev = %p, head = %p\n",
-			bdev->bd_disk->disk_name,
+		dev_info(disk_to_dev(lo->disk),
+			"next = %p, prev = %p, head = %p\n",
 			lo->queue_head.next, lo->queue_head.prev,
 			&lo->queue_head);
 		return 0;