From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Refactor the buffer item release code into a helper, which we will use
in subsequent patches to make the buffer log item lifetime match the
kernel equivalents.
Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
---
v2: fix a bug where we put the buf log item after the buf
---
libxfs/trans.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/libxfs/trans.c b/libxfs/trans.c
index 9de77c8b..121636b5 100644
--- a/libxfs/trans.c
+++ b/libxfs/trans.c
@@ -505,6 +505,16 @@ libxfs_trans_ordered_buf(
return ret;
}
+static void
+xfs_buf_item_put(
+ struct xfs_buf_log_item *bip)
+{
+ struct xfs_buf *bp = bip->bli_buf;
+
+ bp->b_log_item = NULL;
+ kmem_zone_free(xfs_buf_item_zone, bip);
+}
+
void
libxfs_trans_brelse(
xfs_trans_t *tp,
@@ -846,7 +856,6 @@ buf_item_done(
bp = bip->bli_buf;
ASSERT(bp != NULL);
- bp->b_log_item = NULL; /* remove log item */
bp->b_transp = NULL; /* remove xact ptr */
hold = (bip->bli_flags & XFS_BLI_HOLD);
@@ -857,12 +866,12 @@ buf_item_done(
#endif
libxfs_writebuf_int(bp, 0);
}
+
+ bip->bli_flags &= ~XFS_BLI_HOLD;
+ xfs_buf_item_put(bip);
if (hold)
- bip->bli_flags &= ~XFS_BLI_HOLD;
- else
- libxfs_putbuf(bp);
- /* release the buf item */
- kmem_zone_free(xfs_buf_item_zone, bip);
+ return;
+ libxfs_putbuf(bp);
}
static void
