From 2dabd07c5428a56af2912778e6a2f47ad7c4bef5 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Mon, 10 Oct 2011 16:52:51 +0000
Subject: [PATCH] --- yaml --- r: 269928 b: refs/heads/master c:
 02b102df1502a7ea4167d115510e1e8fe6467f12 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/xfs/xfs_buf.c | 6 +++++-
 trunk/fs/xfs/xfs_buf.h | 9 ---------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 9ea3983bab5a..28fefb3603d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b38505b09b7854d446b2f60b4414e3231277aa1a
+refs/heads/master: 02b102df1502a7ea4167d115510e1e8fe6467f12
diff --git a/trunk/fs/xfs/xfs_buf.c b/trunk/fs/xfs/xfs_buf.c
index 0a767fca0305..6f615c259411 100644
--- a/trunk/fs/xfs/xfs_buf.c
+++ b/trunk/fs/xfs/xfs_buf.c
@@ -1457,9 +1457,13 @@ xfs_setsize_buftarg_flags(
 	btp->bt_smask = sectorsize - 1;
 
 	if (set_blocksize(btp->bt_bdev, sectorsize)) {
+		char name[BDEVNAME_SIZE];
+
+		bdevname(btp->bt_bdev, name);
+
 		xfs_warn(btp->bt_mount,
 			"Cannot set_blocksize to %u on device %s\n",
-			sectorsize, xfs_buf_target_name(btp));
+			sectorsize, name);
 		return EINVAL;
 	}
 
diff --git a/trunk/fs/xfs/xfs_buf.h b/trunk/fs/xfs/xfs_buf.h
index 357a3371cae7..be19dd2b0212 100644
--- a/trunk/fs/xfs/xfs_buf.h
+++ b/trunk/fs/xfs/xfs_buf.h
@@ -230,15 +230,6 @@ extern void xfs_buf_delwri_promote(struct xfs_buf *);
 extern int xfs_buf_init(void);
 extern void xfs_buf_terminate(void);
 
-static inline const char *
-xfs_buf_target_name(struct xfs_buftarg *target)
-{
-	static char __b[BDEVNAME_SIZE];
-
-	return bdevname(target->bt_bdev, __b);
-}
-
-
 #define XFS_BUF_ZEROFLAGS(bp) \
 	((bp)->b_flags &= ~(XBF_READ|XBF_WRITE|XBF_ASYNC|XBF_DELWRI| \
 			    XBF_SYNCIO|XBF_FUA|XBF_FLUSH))