diff options
author | Chandra Seetharaman <sekharan@us.ibm.com> | 2011-07-22 23:40:46 +0000 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2011-07-25 15:03:37 -0500 |
commit | c35a549c8b9e85bdff7e531a410d10e36b4b4f32 (patch) | |
tree | b23147bbbe1f84fef1abc7912c0b7a38b9a30fdd /fs/xfs/linux-2.6/xfs_buf.h | |
parent | 49074c069cd3f0f683325d0c7f8b2765dbe2e294 (diff) | |
download | op-kernel-dev-c35a549c8b9e85bdff7e531a410d10e36b4b4f32.zip op-kernel-dev-c35a549c8b9e85bdff7e531a410d10e36b4b4f32.tar.gz |
xfs: Remove the macro XFS_BUFTARG_NAME
Remove the definition and usages of the macro XFS_BUFTARG_NAME.
Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_buf.h')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_buf.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/xfs/linux-2.6/xfs_buf.h b/fs/xfs/linux-2.6/xfs_buf.h index 4b30499..620972b 100644 --- a/fs/xfs/linux-2.6/xfs_buf.h +++ b/fs/xfs/linux-2.6/xfs_buf.h @@ -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); |