xfs: Remove the macro XFS_BUF_SET_PTR
Remove the definition and usages of the macro XFS_BUF_SET_PTR. Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Alex Elder <aelder@sgi.com>
This commit is contained in:
parent
6292604447
commit
02fe03d909
|
@ -266,7 +266,6 @@ void xfs_buf_stale(struct xfs_buf *bp);
|
||||||
#define XFS_BUF_UNWRITE(bp) ((bp)->b_flags &= ~XBF_WRITE)
|
#define XFS_BUF_UNWRITE(bp) ((bp)->b_flags &= ~XBF_WRITE)
|
||||||
#define XFS_BUF_ISWRITE(bp) ((bp)->b_flags & XBF_WRITE)
|
#define XFS_BUF_ISWRITE(bp) ((bp)->b_flags & XBF_WRITE)
|
||||||
|
|
||||||
#define XFS_BUF_SET_PTR(bp, val, cnt) xfs_buf_associate_memory(bp, val, cnt)
|
|
||||||
#define XFS_BUF_ADDR(bp) ((bp)->b_bn)
|
#define XFS_BUF_ADDR(bp) ((bp)->b_bn)
|
||||||
#define XFS_BUF_SET_ADDR(bp, bno) ((bp)->b_bn = (xfs_daddr_t)(bno))
|
#define XFS_BUF_SET_ADDR(bp, bno) ((bp)->b_bn = (xfs_daddr_t)(bno))
|
||||||
#define XFS_BUF_OFFSET(bp) ((bp)->b_file_offset)
|
#define XFS_BUF_OFFSET(bp) ((bp)->b_file_offset)
|
||||||
|
|
|
@ -1395,8 +1395,8 @@ xlog_sync(xlog_t *log,
|
||||||
if (split) {
|
if (split) {
|
||||||
bp = iclog->ic_log->l_xbuf;
|
bp = iclog->ic_log->l_xbuf;
|
||||||
XFS_BUF_SET_ADDR(bp, 0); /* logical 0 */
|
XFS_BUF_SET_ADDR(bp, 0); /* logical 0 */
|
||||||
XFS_BUF_SET_PTR(bp, (xfs_caddr_t)((__psint_t)&(iclog->ic_header)+
|
xfs_buf_associate_memory(bp,
|
||||||
(__psint_t)count), split);
|
(char *)&iclog->ic_header + count, split);
|
||||||
bp->b_fspriv = iclog;
|
bp->b_fspriv = iclog;
|
||||||
XFS_BUF_ZEROFLAGS(bp);
|
XFS_BUF_ZEROFLAGS(bp);
|
||||||
XFS_BUF_ASYNC(bp);
|
XFS_BUF_ASYNC(bp);
|
||||||
|
|
|
@ -223,14 +223,14 @@ xlog_bread_offset(
|
||||||
int orig_len = bp->b_buffer_length;
|
int orig_len = bp->b_buffer_length;
|
||||||
int error, error2;
|
int error, error2;
|
||||||
|
|
||||||
error = XFS_BUF_SET_PTR(bp, offset, BBTOB(nbblks));
|
error = xfs_buf_associate_memory(bp, offset, BBTOB(nbblks));
|
||||||
if (error)
|
if (error)
|
||||||
return error;
|
return error;
|
||||||
|
|
||||||
error = xlog_bread_noalign(log, blk_no, nbblks, bp);
|
error = xlog_bread_noalign(log, blk_no, nbblks, bp);
|
||||||
|
|
||||||
/* must reset buffer pointer even on error */
|
/* must reset buffer pointer even on error */
|
||||||
error2 = XFS_BUF_SET_PTR(bp, orig_offset, orig_len);
|
error2 = xfs_buf_associate_memory(bp, orig_offset, orig_len);
|
||||||
if (error)
|
if (error)
|
||||||
return error;
|
return error;
|
||||||
return error2;
|
return error2;
|
||||||
|
|
Loading…
Reference in New Issue