xfs
[Top] [All Lists]

[PATCH 09/11] xfs: remove xfs_buf_target_name

To: xfs@xxxxxxxxxxx
Subject: [PATCH 09/11] xfs: remove xfs_buf_target_name
From: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Date: Mon, 10 Oct 2011 12:52:51 -0400
References: <20111010165242.656850411@xxxxxxxxxxxxxxxxxxxxxx>
User-agent: quilt/0.48-1
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@xxxxxx>
Reviewed-by: Alex Elder <aelder@xxxxxxx>
Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx>

Index: xfs/fs/xfs/xfs_buf.c
===================================================================
--- xfs.orig/fs/xfs/xfs_buf.c   2011-10-07 16:40:30.765017266 +0200
+++ xfs/fs/xfs/xfs_buf.c        2011-10-09 16:32:03.385324804 +0200
@@ -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;
        }
 
Index: xfs/fs/xfs/xfs_buf.h
===================================================================
--- xfs.orig/fs/xfs/xfs_buf.h   2011-10-07 16:40:30.769018056 +0200
+++ xfs/fs/xfs/xfs_buf.h        2011-10-09 16:31:46.237323692 +0200
@@ -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))

<Prev in Thread] Current Thread [Next in Thread>