diff options
author | Chandra Seetharaman <sekharan@us.ibm.com> | 2011-07-22 19:40:15 -0400 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2011-07-25 16:03:13 -0400 |
commit | 6292604447ade7d150f5eba3b1518e1a224fda15 (patch) | |
tree | a33ff273c5d2e9b60bd468aa6c077d173187da28 /fs/xfs/xfs_log_recover.c | |
parent | 0095a21eb6ae8ac9f9860aa26029fe6ebbd3beeb (diff) |
xfs: Remove the macro XFS_BUF_PTR
Remove the definition and usages of the macro XFS_BUF_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>
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
-rw-r--r-- | fs/xfs/xfs_log_recover.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 536eb0dd94d6..1ac295da9f17 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c | |||
@@ -147,7 +147,7 @@ xlog_align( | |||
147 | xfs_daddr_t offset = blk_no & ((xfs_daddr_t)log->l_sectBBsize - 1); | 147 | xfs_daddr_t offset = blk_no & ((xfs_daddr_t)log->l_sectBBsize - 1); |
148 | 148 | ||
149 | ASSERT(BBTOB(offset + nbblks) <= XFS_BUF_SIZE(bp)); | 149 | ASSERT(BBTOB(offset + nbblks) <= XFS_BUF_SIZE(bp)); |
150 | return XFS_BUF_PTR(bp) + BBTOB(offset); | 150 | return bp->b_addr + BBTOB(offset); |
151 | } | 151 | } |
152 | 152 | ||
153 | 153 | ||
@@ -219,7 +219,7 @@ xlog_bread_offset( | |||
219 | xfs_buf_t *bp, | 219 | xfs_buf_t *bp, |
220 | xfs_caddr_t offset) | 220 | xfs_caddr_t offset) |
221 | { | 221 | { |
222 | xfs_caddr_t orig_offset = XFS_BUF_PTR(bp); | 222 | xfs_caddr_t orig_offset = bp->b_addr; |
223 | int orig_len = bp->b_buffer_length; | 223 | int orig_len = bp->b_buffer_length; |
224 | int error, error2; | 224 | int error, error2; |
225 | 225 | ||
@@ -1260,7 +1260,7 @@ xlog_write_log_records( | |||
1260 | */ | 1260 | */ |
1261 | ealign = round_down(end_block, sectbb); | 1261 | ealign = round_down(end_block, sectbb); |
1262 | if (j == 0 && (start_block + endcount > ealign)) { | 1262 | if (j == 0 && (start_block + endcount > ealign)) { |
1263 | offset = XFS_BUF_PTR(bp) + BBTOB(ealign - start_block); | 1263 | offset = bp->b_addr + BBTOB(ealign - start_block); |
1264 | error = xlog_bread_offset(log, ealign, sectbb, | 1264 | error = xlog_bread_offset(log, ealign, sectbb, |
1265 | bp, offset); | 1265 | bp, offset); |
1266 | if (error) | 1266 | if (error) |
@@ -3433,7 +3433,7 @@ xlog_do_recovery_pass( | |||
3433 | /* | 3433 | /* |
3434 | * Check for header wrapping around physical end-of-log | 3434 | * Check for header wrapping around physical end-of-log |
3435 | */ | 3435 | */ |
3436 | offset = XFS_BUF_PTR(hbp); | 3436 | offset = hbp->b_addr; |
3437 | split_hblks = 0; | 3437 | split_hblks = 0; |
3438 | wrapped_hblks = 0; | 3438 | wrapped_hblks = 0; |
3439 | if (blk_no + hblks <= log->l_logBBsize) { | 3439 | if (blk_no + hblks <= log->l_logBBsize) { |
@@ -3493,7 +3493,7 @@ xlog_do_recovery_pass( | |||
3493 | } else { | 3493 | } else { |
3494 | /* This log record is split across the | 3494 | /* This log record is split across the |
3495 | * physical end of log */ | 3495 | * physical end of log */ |
3496 | offset = XFS_BUF_PTR(dbp); | 3496 | offset = dbp->b_addr; |
3497 | split_bblks = 0; | 3497 | split_bblks = 0; |
3498 | if (blk_no != log->l_logBBsize) { | 3498 | if (blk_no != log->l_logBBsize) { |
3499 | /* some data is before the physical | 3499 | /* some data is before the physical |