On 5/20/19 5:56 PM, Darrick J. Wong wrote:
> On Thu, May 16, 2019 at 03:39:49PM -0500, Eric Sandeen wrote:
>> Most of xfs_trans_bjoin is duplicated in xfs_trans_get_buf_map,
>> xfs_trans_getsb and xfs_trans_read_buf_map. Add a new
>> _xfs_trans_bjoin which can be called by all three functions.
>>
>> Source kernel commit: d7e84f413726876c0ec66bbf90770f69841f7663
>>
>> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
>> Reviewed-by: Dave Chinner <david@xxxxxxxxxxxxx>
>> Signed-off-by: Alex Elder <aelder@xxxxxxx>
>> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
>> ---
>> libxfs/trans.c | 53 +++++++++++++++++++++++++++++++++++++-------------
>> 1 file changed, 39 insertions(+), 14 deletions(-)
>>
>> diff --git a/libxfs/trans.c b/libxfs/trans.c
>> index f3c28fa7..f78222fd 100644
>> --- a/libxfs/trans.c
>> +++ b/libxfs/trans.c
>> @@ -537,19 +537,50 @@ xfs_trans_binval(
>> tp->t_flags |= XFS_TRANS_DIRTY;
>> }
>>
>> -void
>> -xfs_trans_bjoin(
>> - xfs_trans_t *tp,
>> - xfs_buf_t *bp)
>> +/*
>> + * Add the locked buffer to the transaction.
>> + *
>> + * The buffer must be locked, and it cannot be associated with any
>> + * transaction.
>> + *
>> + * If the buffer does not yet have a buf log item associated with it,
>> + * then allocate one for it. Then add the buf item to the transaction.
>> + */
>> +STATIC void
>> +_xfs_trans_bjoin(
>> + struct xfs_trans *tp,
>> + struct xfs_buf *bp,
>> + int reset_recur)
>
> bool?
If you fix it in the kernel I'll merge it to xfsprogs ;)
>> {
>> - xfs_buf_log_item_t *bip;
>> + struct xfs_buf_log_item *bip;
>>
>> ASSERT(bp->b_transp == NULL);
>>
>> + /*
>> + * The xfs_buf_log_item pointer is stored in b_log_item. If
>> + * it doesn't have one yet, then allocate one and initialize it.
>> + * The checks to see if one is there are in xfs_buf_item_init().
>> + */
>> xfs_buf_item_init(bp, tp->t_mountp);
>> bip = bp->b_log_item;
>> + if (reset_recur)
>> + bip->bli_recur = 0;
>> +
>> + /*
>> + * Attach the item to the transaction so we can find it in
>> + * xfs_trans_get_buf() and friends.
>> + */
>> xfs_trans_add_item(tp, (xfs_log_item_t *)bip);
>
> Kill typedef here ^^^^^^?
ditto.
Point of all this is to match the kernel for easier future syncups.
(oh wait, actually, this is fixed in a later patch, getting rid of the dumb
cast altogether)
-Eric
> --D
>
>> bp->b_transp = tp;
>> +
>> +}
>> +
>> +void
>> +xfs_trans_bjoin(
>> + struct xfs_trans *tp,
>> + struct xfs_buf *bp)
>> +{
>> + _xfs_trans_bjoin(tp, bp, 0);
>> trace_xfs_trans_bjoin(bp->b_log_item);
>> }
>>
>> @@ -594,9 +625,7 @@ xfs_trans_get_buf_map(
>> if (bp == NULL)
>> return NULL;
>>
>> - xfs_trans_bjoin(tp, bp);
>> - bip = bp->b_log_item;
>> - bip->bli_recur = 0;
>> + _xfs_trans_bjoin(tp, bp, 1);
>> trace_xfs_trans_get_buf(bp->b_log_item);
>> return bp;
>> }
>> @@ -626,9 +655,7 @@ xfs_trans_getsb(
>>
>> bp = xfs_getsb(mp);
>>
>> - xfs_trans_bjoin(tp, bp);
>> - bip = bp->b_log_item;
>> - bip->bli_recur = 0;
>> + _xfs_trans_bjoin(tp, bp, 1);
>> trace_xfs_trans_getsb(bp->b_log_item);
>> return bp;
>> }
>> @@ -677,9 +704,7 @@ xfs_trans_read_buf_map(
>> if (bp->b_error)
>> goto out_relse;
>>
>> - xfs_trans_bjoin(tp, bp);
>> - bip = bp->b_log_item;
>> - bip->bli_recur = 0;
>> + _xfs_trans_bjoin(tp, bp, 1);
>> done:
>> trace_xfs_trans_read_buf(bp->b_log_item);
>> *bpp = bp;
>> --
>> 2.17.0
>>
