Skip to content

Commit

Permalink
xfs: add a proper transaction pointer to struct xfs_buf
Browse files Browse the repository at this point in the history 
Replace the typeless b_fspriv2 and the ugly macros around it with a properly
typed transaction pointer.  As a fallout the log buffer state debug checks
are also removed.  We could have kept them using casts, but as they do
not have a real purpose we can as well just remove them.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
  • Loading branch information
Christoph Hellwig committed Jul 13, 2011
1 parent 77936d0 commit bf9d901
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 30 deletions.
4 changes: 1 addition & 3 deletions fs/xfs/linux-2.6/xfs_buf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ typedef struct xfs_buf {
xfs_buf_iodone_t b_iodone; /* I/O completion function */
struct completion b_iowait; /* queue for I/O waiters */
void *b_fspriv;
void *b_fspriv2;
struct xfs_trans *b_transp;
struct page **b_pages; /* array of page pointers */
struct page *b_page_array[XB_PAGES]; /* inline pages */
unsigned long b_queuetime; /* time buffer was queued */
Expand Down Expand Up @@ -282,8 +282,6 @@ void xfs_buf_stale(struct xfs_buf *bp);

#define XFS_BUF_FSPRIVATE(bp, type) ((type)(bp)->b_fspriv)
#define XFS_BUF_SET_FSPRIVATE(bp, val) ((bp)->b_fspriv = (void*)(val))
#define XFS_BUF_FSPRIVATE2(bp, type) ((type)(bp)->b_fspriv2)
#define XFS_BUF_SET_FSPRIVATE2(bp, val) ((bp)->b_fspriv2 = (void*)(val))
#define XFS_BUF_SET_START(bp) do { } while (0)

#define XFS_BUF_PTR(bp) (xfs_caddr_t)((bp)->b_addr)
Expand Down
4 changes: 2 additions & 2 deletions fs/xfs/xfs_buf_item.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ xfs_buf_item_unpin(
* Since the transaction no longer refers to the buffer,
* the buffer should no longer refer to the transaction.
*/
XFS_BUF_SET_FSPRIVATE2(bp, NULL);
bp->b_transp = NULL;
}

/*
Expand Down Expand Up @@ -525,7 +525,7 @@ xfs_buf_item_unlock(
uint hold;

/* Clear the buffer's association with this transaction. */
XFS_BUF_SET_FSPRIVATE2(bp, NULL);
bp->b_transp = NULL;

/*
* If this is a transaction abort, don't return early. Instead, allow
Expand Down
9 changes: 0 additions & 9 deletions fs/xfs/xfs_log.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -876,8 +876,6 @@ xlog_iodone(xfs_buf_t *bp)
int aborted;

iclog = XFS_BUF_FSPRIVATE(bp, xlog_in_core_t *);
ASSERT(XFS_BUF_FSPRIVATE2(bp, unsigned long) == (unsigned long) 2);
XFS_BUF_SET_FSPRIVATE2(bp, (unsigned long)1);
aborted = 0;
l = iclog->ic_log;

Expand Down Expand Up @@ -1057,7 +1055,6 @@ xlog_alloc_log(xfs_mount_t *mp,
if (!bp)
goto out_free_log;
XFS_BUF_SET_IODONE_FUNC(bp, xlog_iodone);
XFS_BUF_SET_FSPRIVATE2(bp, (unsigned long)1);
ASSERT(XFS_BUF_ISBUSY(bp));
ASSERT(xfs_buf_islocked(bp));
log->l_xbuf = bp;
Expand Down Expand Up @@ -1092,7 +1089,6 @@ xlog_alloc_log(xfs_mount_t *mp,
goto out_free_iclog;

XFS_BUF_SET_IODONE_FUNC(bp, xlog_iodone);
XFS_BUF_SET_FSPRIVATE2(bp, (unsigned long)1);
iclog->ic_bp = bp;
iclog->ic_data = bp->b_addr;
#ifdef DEBUG
Expand Down Expand Up @@ -1349,8 +1345,6 @@ xlog_sync(xlog_t *log,
}

bp = iclog->ic_bp;
ASSERT(XFS_BUF_FSPRIVATE2(bp, unsigned long) == (unsigned long)1);
XFS_BUF_SET_FSPRIVATE2(bp, (unsigned long)2);
XFS_BUF_SET_ADDR(bp, BLOCK_LSN(be64_to_cpu(iclog->ic_header.h_lsn)));

XFS_STATS_ADD(xs_log_blocks, BTOBB(count));
Expand Down Expand Up @@ -1408,9 +1402,6 @@ xlog_sync(xlog_t *log,
}
if (split) {
bp = iclog->ic_log->l_xbuf;
ASSERT(XFS_BUF_FSPRIVATE2(bp, unsigned long) ==
(unsigned long)1);
XFS_BUF_SET_FSPRIVATE2(bp, (unsigned long)2);
XFS_BUF_SET_ADDR(bp, 0); /* logical 0 */
XFS_BUF_SET_PTR(bp, (xfs_caddr_t)((__psint_t)&(iclog->ic_header)+
(__psint_t)count), split);
Expand Down
32 changes: 16 additions & 16 deletions fs/xfs/xfs_trans_buf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ _xfs_trans_bjoin(
struct xfs_buf_log_item *bip;

ASSERT(XFS_BUF_ISBUSY(bp));
ASSERT(XFS_BUF_FSPRIVATE2(bp, void *) == NULL);
ASSERT(bp->b_transp == NULL);

/*
* The xfs_buf_log_item pointer is stored in b_fsprivate. If
Expand Down Expand Up @@ -110,7 +110,7 @@ _xfs_trans_bjoin(
* Initialize b_fsprivate2 so we can find it with incore_match()
* in xfs_trans_get_buf() and friends above.
*/
XFS_BUF_SET_FSPRIVATE2(bp, tp);
bp->b_transp = tp;

}

Expand Down Expand Up @@ -172,7 +172,7 @@ xfs_trans_get_buf(xfs_trans_t *tp,
else if (XFS_BUF_ISSTALE(bp))
ASSERT(!XFS_BUF_ISDELAYWRITE(bp));

ASSERT(XFS_BUF_FSPRIVATE2(bp, xfs_trans_t *) == tp);
ASSERT(bp->b_transp == tp);
bip = XFS_BUF_FSPRIVATE(bp, xfs_buf_log_item_t *);
ASSERT(bip != NULL);
ASSERT(atomic_read(&bip->bli_refcount) > 0);
Expand Down Expand Up @@ -232,7 +232,7 @@ xfs_trans_getsb(xfs_trans_t *tp,
* recursion count and return the buffer to the caller.
*/
bp = mp->m_sb_bp;
if (XFS_BUF_FSPRIVATE2(bp, xfs_trans_t *) == tp) {
if (bp->b_transp == tp) {
bip = XFS_BUF_FSPRIVATE(bp, xfs_buf_log_item_t*);
ASSERT(bip != NULL);
ASSERT(atomic_read(&bip->bli_refcount) > 0);
Expand Down Expand Up @@ -328,7 +328,7 @@ xfs_trans_read_buf(
bp = xfs_trans_buf_item_match(tp, target, blkno, len);
if (bp != NULL) {
ASSERT(xfs_buf_islocked(bp));
ASSERT(XFS_BUF_FSPRIVATE2(bp, xfs_trans_t *) == tp);
ASSERT(bp->b_transp == tp);
ASSERT(XFS_BUF_FSPRIVATE(bp, void *) != NULL);
ASSERT((XFS_BUF_ISERROR(bp)) == 0);
if (!(XFS_BUF_ISDONE(bp))) {
Expand Down Expand Up @@ -466,7 +466,7 @@ xfs_trans_brelse(xfs_trans_t *tp,
* Default to a normal brelse() call if the tp is NULL.
*/
if (tp == NULL) {
ASSERT(XFS_BUF_FSPRIVATE2(bp, void *) == NULL);
ASSERT(bp->b_transp == NULL);
/*
* If there's a buf log item attached to the buffer,
* then let the AIL know that the buffer is being
Expand All @@ -484,7 +484,7 @@ xfs_trans_brelse(xfs_trans_t *tp,
return;
}

ASSERT(XFS_BUF_FSPRIVATE2(bp, xfs_trans_t *) == tp);
ASSERT(bp->b_transp == tp);
bip = XFS_BUF_FSPRIVATE(bp, xfs_buf_log_item_t *);
ASSERT(bip->bli_item.li_type == XFS_LI_BUF);
ASSERT(!(bip->bli_flags & XFS_BLI_STALE));
Expand Down Expand Up @@ -556,7 +556,7 @@ xfs_trans_brelse(xfs_trans_t *tp,
xfs_buf_item_relse(bp);
bip = NULL;
}
XFS_BUF_SET_FSPRIVATE2(bp, NULL);
bp->b_transp = NULL;

/*
* If we've still got a buf log item on the buffer, then
Expand Down Expand Up @@ -584,7 +584,7 @@ xfs_trans_bhold(xfs_trans_t *tp,
xfs_buf_log_item_t *bip;

ASSERT(XFS_BUF_ISBUSY(bp));
ASSERT(XFS_BUF_FSPRIVATE2(bp, xfs_trans_t *) == tp);
ASSERT(bp->b_transp == tp);
ASSERT(XFS_BUF_FSPRIVATE(bp, void *) != NULL);

bip = XFS_BUF_FSPRIVATE(bp, xfs_buf_log_item_t *);
Expand All @@ -606,7 +606,7 @@ xfs_trans_bhold_release(xfs_trans_t *tp,
xfs_buf_log_item_t *bip;

ASSERT(XFS_BUF_ISBUSY(bp));
ASSERT(XFS_BUF_FSPRIVATE2(bp, xfs_trans_t *) == tp);
ASSERT(bp->b_transp == tp);
ASSERT(XFS_BUF_FSPRIVATE(bp, void *) != NULL);

bip = XFS_BUF_FSPRIVATE(bp, xfs_buf_log_item_t *);
Expand Down Expand Up @@ -637,7 +637,7 @@ xfs_trans_log_buf(xfs_trans_t *tp,
xfs_buf_log_item_t *bip;

ASSERT(XFS_BUF_ISBUSY(bp));
ASSERT(XFS_BUF_FSPRIVATE2(bp, xfs_trans_t *) == tp);
ASSERT(bp->b_transp == tp);
ASSERT(XFS_BUF_FSPRIVATE(bp, void *) != NULL);
ASSERT((first <= last) && (last < XFS_BUF_COUNT(bp)));
ASSERT((XFS_BUF_IODONE_FUNC(bp) == NULL) ||
Expand Down Expand Up @@ -709,7 +709,7 @@ xfs_trans_binval(
xfs_buf_log_item_t *bip;

ASSERT(XFS_BUF_ISBUSY(bp));
ASSERT(XFS_BUF_FSPRIVATE2(bp, xfs_trans_t *) == tp);
ASSERT(bp->b_transp == tp);
ASSERT(XFS_BUF_FSPRIVATE(bp, void *) != NULL);

bip = XFS_BUF_FSPRIVATE(bp, xfs_buf_log_item_t *);
Expand Down Expand Up @@ -783,7 +783,7 @@ xfs_trans_inode_buf(
xfs_buf_log_item_t *bip;

ASSERT(XFS_BUF_ISBUSY(bp));
ASSERT(XFS_BUF_FSPRIVATE2(bp, xfs_trans_t *) == tp);
ASSERT(bp->b_transp == tp);
ASSERT(XFS_BUF_FSPRIVATE(bp, void *) != NULL);

bip = XFS_BUF_FSPRIVATE(bp, xfs_buf_log_item_t *);
Expand All @@ -809,7 +809,7 @@ xfs_trans_stale_inode_buf(
xfs_buf_log_item_t *bip;

ASSERT(XFS_BUF_ISBUSY(bp));
ASSERT(XFS_BUF_FSPRIVATE2(bp, xfs_trans_t *) == tp);
ASSERT(bp->b_transp == tp);
ASSERT(XFS_BUF_FSPRIVATE(bp, void *) != NULL);

bip = XFS_BUF_FSPRIVATE(bp, xfs_buf_log_item_t *);
Expand All @@ -836,7 +836,7 @@ xfs_trans_inode_alloc_buf(
xfs_buf_log_item_t *bip;

ASSERT(XFS_BUF_ISBUSY(bp));
ASSERT(XFS_BUF_FSPRIVATE2(bp, xfs_trans_t *) == tp);
ASSERT(bp->b_transp == tp);
ASSERT(XFS_BUF_FSPRIVATE(bp, void *) != NULL);

bip = XFS_BUF_FSPRIVATE(bp, xfs_buf_log_item_t *);
Expand Down Expand Up @@ -866,7 +866,7 @@ xfs_trans_dquot_buf(
xfs_buf_log_item_t *bip;

ASSERT(XFS_BUF_ISBUSY(bp));
ASSERT(XFS_BUF_FSPRIVATE2(bp, xfs_trans_t *) == tp);
ASSERT(bp->b_transp == tp);
ASSERT(XFS_BUF_FSPRIVATE(bp, void *) != NULL);
ASSERT(type == XFS_BLF_UDQUOT_BUF ||
type == XFS_BLF_PDQUOT_BUF ||
Expand Down

0 comments on commit bf9d901

Please sign in to comment.