Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02b102df authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: remove xfs_buf_target_name 



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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent b38505b0

fs/xfs/xfs_buf.c

+5 −1
Original line number Diff line number Diff line
@@ -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;

	}

fs/xfs/xfs_buf.h

+0 −9
Original line number Diff line number Diff line
@@ -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))