From 13252857828a1f0e4181a991f794f8089690b831 Mon Sep 17 00:00:00 2001
From: Tao Ma <boyu.mt@taobao.com>
Date: Mon, 31 Oct 2011 17:09:00 -0700
Subject: [PATCH] --- yaml --- r: 272152 b: refs/heads/master c:
 72a2ebd8bc62e6658513d3b2a1119e91c3ea6810 h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/fs/buffer.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5f518314fb0d..ca94d6ae2f3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 584cff54e1ff8f59d5109dc8093efedff8bcc375
+refs/heads/master: 72a2ebd8bc62e6658513d3b2a1119e91c3ea6810
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index 936d6035f6e2..70a19745cb61 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/fs/buffer.c
@@ -213,13 +213,16 @@ __find_get_block_slow(struct block_device *bdev, sector_t block)
 	 * elsewhere, don't buffer_error if we had some unmapped buffers
 	 */
 	if (all_mapped) {
+		char b[BDEVNAME_SIZE];
+
 		printk("__find_get_block_slow() failed. "
 			"block=%llu, b_blocknr=%llu\n",
 			(unsigned long long)block,
 			(unsigned long long)bh->b_blocknr);
 		printk("b_state=0x%08lx, b_size=%zu\n",
 			bh->b_state, bh->b_size);
-		printk("device blocksize: %d\n", 1 << bd_inode->i_blkbits);
+		printk("device %s blocksize: %d\n", bdevname(bdev, b),
+			1 << bd_inode->i_blkbits);
 	}
 out_unlock:
 	spin_unlock(&bd_mapping->private_lock);