Commit c35a549c authored by Chandra Seetharaman's avatar Chandra Seetharaman Committed by Alex Elder
Browse files

xfs: Remove the macro XFS_BUFTARG_NAME 



Remove the definition and usages of the macro XFS_BUFTARG_NAME.

Signed-off-by: default avatarChandra Seetharaman <sekharan@us.ibm.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent 49074c06

fs/xfs/linux-2.6/xfs_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -1480,7 +1480,7 @@ xfs_setsize_buftarg_flags( 
	if (set_blocksize(btp->bt_bdev, sectorsize)) {

		xfs_warn(btp->bt_mount,

			"Cannot set_blocksize to %u on device %s\n",

			sectorsize, XFS_BUFTARG_NAME(btp));

			sectorsize, xfs_buf_target_name(btp));

		return EINVAL;

	}

fs/xfs/linux-2.6/xfs_buf.h

+7 −4
Original line number Diff line number Diff line
@@ -228,8 +228,13 @@ extern void xfs_buf_delwri_promote(xfs_buf_t *); 
extern int xfs_buf_init(void);

extern void xfs_buf_terminate(void);



#define xfs_buf_target_name(target)	\

	({ char __b[BDEVNAME_SIZE]; bdevname((target)->bt_bdev, __b); __b; })

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) \
@@ -292,8 +297,6 @@ static inline int xfs_buf_ispinned(struct xfs_buf *bp) 


#define XFS_BUF_FINISH_IOWAIT(bp)	complete(&bp->b_iowait);



#define XFS_BUFTARG_NAME(target)	xfs_buf_target_name(target)



static inline void xfs_buf_relse(xfs_buf_t *bp)

{

	xfs_buf_unlock(bp);

fs/xfs/xfs_buf_item.c

+1 −1
Original line number Diff line number Diff line
@@ -975,7 +975,7 @@ xfs_buf_iodone_callbacks( 
	    time_after(jiffies, (lasttime + 5*HZ))) {

		lasttime = jiffies;

		xfs_alert(mp, "Device %s: metadata write error block 0x%llx",

			XFS_BUFTARG_NAME(bp->b_target),

			xfs_buf_target_name(bp->b_target),

		      (__uint64_t)XFS_BUF_ADDR(bp));

	}

	lasttarg = bp->b_target;

fs/xfs/xfs_rw.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ xfs_ioerror_alert( 
	xfs_alert(mp,

		 "I/O error occurred: meta-data dev %s block 0x%llx"

		 "       (\"%s\") error %d buf count %zd",

		XFS_BUFTARG_NAME(bp->b_target),

		xfs_buf_target_name(bp->b_target),

		(__uint64_t)blkno, func,

		bp->b_error, XFS_BUF_COUNT(bp));

}