[PATCH 9/9] xfs: remove xfs_buf_target_name

Christoph Hellwig
2011-10-06T21:06:41Z

[-- Attachment #1: xfs-kill-xfs_buf_target_name --]
[-- Type: text/plain, Size: 1560 bytes --]

The calling convention that returns a pointer to a static buffer is
fairly nasty, so just opencode it in the only caller that is left.

Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: xfs/fs/xfs/xfs_buf.c
===================================================================
--- xfs.orig/fs/xfs/xfs_buf.c 2011-10-06 14:37:16.142921041 -0400
+++ xfs/fs/xfs/xfs_buf.c 2011-10-06 14:37:17.846921461 -0400
@@ -1457,9 +1457,13 @@ xfs_setsize_buftarg_flags(
btp->bt_smask = sectorsize - 1;

if (set_blocksize(btp->bt_bdev, sectorsize)) {
+ static 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;
}

Index: xfs/fs/xfs/xfs_buf.h
===================================================================
--- xfs.orig/fs/xfs/xfs_buf.h 2011-10-06 14:37:16.142921041 -0400
+++ xfs/fs/xfs/xfs_buf.h 2011-10-06 14:37:17.850917164 -0400
@@ -230,15 +230,6 @@ extern void xfs_buf_delwri_promote(struc
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))