Commit 6bda7ecb authored by Nathan Scott's avatar Nathan Scott

[XFS] Cleanup bdevname conditional code in xfs_buf headers.

SGI Modid: 2.5.x-xfs:slinx:163365a
parent 21df1193
...@@ -334,4 +334,7 @@ extern void pagebuf_trace( ...@@ -334,4 +334,7 @@ extern void pagebuf_trace(
# define pagebuf_trace(pb, id, ptr, ra) do { } while (0) # define pagebuf_trace(pb, id, ptr, ra) do { } while (0)
#endif #endif
#define pagebuf_target_name(target) \
({ char __b[BDEVNAME_SIZE]; bdevname((target)->pbr_bdev, __b); __b; })
#endif /* __PAGE_BUF_H__ */ #endif /* __PAGE_BUF_H__ */
...@@ -181,7 +181,7 @@ extern inline xfs_caddr_t xfs_buf_offset(page_buf_t *bp, size_t offset) ...@@ -181,7 +181,7 @@ extern inline xfs_caddr_t xfs_buf_offset(page_buf_t *bp, size_t offset)
#define XFS_BUF_SET_VTYPE(bp, type) #define XFS_BUF_SET_VTYPE(bp, type)
#define XFS_BUF_SET_REF(bp, ref) #define XFS_BUF_SET_REF(bp, ref)
#define XFS_BUF_ISPINNED(bp) pagebuf_ispin(bp) #define XFS_BUF_ISPINNED(bp) pagebuf_ispin(bp)
#define XFS_BUF_VALUSEMA(bp) pagebuf_lock_value(bp) #define XFS_BUF_VALUSEMA(bp) pagebuf_lock_value(bp)
#define XFS_BUF_CPSEMA(bp) (pagebuf_cond_lock(bp) == 0) #define XFS_BUF_CPSEMA(bp) (pagebuf_cond_lock(bp) == 0)
...@@ -191,13 +191,11 @@ extern inline xfs_caddr_t xfs_buf_offset(page_buf_t *bp, size_t offset) ...@@ -191,13 +191,11 @@ extern inline xfs_caddr_t xfs_buf_offset(page_buf_t *bp, size_t offset)
/* setup the buffer target from a buftarg structure */ /* setup the buffer target from a buftarg structure */
#define XFS_BUF_SET_TARGET(bp, target) \ #define XFS_BUF_SET_TARGET(bp, target) \
(bp)->pb_target = (target) (bp)->pb_target = (target)
#define XFS_BUF_TARGET(bp) ((bp)->pb_target) #define XFS_BUF_TARGET(bp) ((bp)->pb_target)
#define XFS_BUFTARG_NAME(target) \
pagebuf_target_name(target)
#define XFS_BUFTARG_NAME(target) \
({ char __b[BDEVNAME_SIZE]; bdevname((target->pbr_bdev), __b); __b; })
#define XFS_BUF_SET_VTYPE_REF(bp, type, ref) #define XFS_BUF_SET_VTYPE_REF(bp, type, ref)
#define XFS_BUF_SET_VTYPE(bp, type) #define XFS_BUF_SET_VTYPE(bp, type)
#define XFS_BUF_SET_REF(bp, ref) #define XFS_BUF_SET_REF(bp, ref)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment