]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
libxfs: fix argument to xfs_trans_add_item
authorEric Sandeen <sandeen@redhat.com>
Tue, 21 May 2019 16:03:21 +0000 (11:03 -0500)
committerEric Sandeen <sandeen@redhat.com>
Tue, 21 May 2019 16:03:21 +0000 (11:03 -0500)
The hack of casting an inode_log_item or buf_log_item to a
xfs_log_item_t is pretty gross; yes it's the first member in the
structure, but yuk.  Pass in the correct structure member.

This was fixed in the kernel with commit e98c414f9
("xfs: simplify log item descriptor tracking")

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Allison Collins <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
libxfs/trans.c

index dc924faa0205039d821b6bf6984a3ea8936e6ff6..c7a1d529227c6dc3a3d0af152d461eb04f9982cb 100644 (file)
@@ -346,7 +346,7 @@ libxfs_trans_ijoin(
        ASSERT(iip->ili_lock_flags == 0);
        iip->ili_lock_flags = lock_flags;
 
-       xfs_trans_add_item(tp, (xfs_log_item_t *)(iip));
+       xfs_trans_add_item(tp, &iip->ili_item);
 }
 
 void
@@ -570,7 +570,7 @@ _libxfs_trans_bjoin(
         * 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);
+       xfs_trans_add_item(tp, &bip->bli_item);
        bp->b_transp = tp;
 
 }