| Message ID | 1558410427-1837-5-git-send-email-sandeen@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | xfsprogs: libxfs spring cleaning take 3 | expand |
On Mon, May 20, 2019 at 10:47:04PM -0500, Eric Sandeen wrote: > 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> > Signed-off-by: Eric Sandeen <sandeen@sandeen.net> Looks good, Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/libxfs/trans.c b/libxfs/trans.c index dc924fa..c7a1d52 100644 --- a/libxfs/trans.c +++ b/libxfs/trans.c @@ -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; }
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> Signed-off-by: Eric Sandeen <sandeen@sandeen.net> --- libxfs/trans.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)