Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3b14aac authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: don't cast inode_log_items to get the log_item 



The cast is not type safe, and we can just dereference the first
member instead to start with.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 9ce632a2

fs/xfs/xfs_inode.c

+2 −2
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ xfs_lock_inodes( 
		 */

		if (!try_lock) {

			for (j = (i - 1); j >= 0 && !try_lock; j--) {

				lp = (xfs_log_item_t *)ips[j]->i_itemp;

				lp = &ips[j]->i_itemp->ili_item;

				if (lp && test_bit(XFS_LI_IN_AIL, &lp->li_flags))

					try_lock++;

			}
@@ -585,7 +585,7 @@ xfs_lock_two_inodes( 
	 * the second lock. If we can't get it, we must release the first one

	 * and try again.

	 */

	lp = (xfs_log_item_t *)ip0->i_itemp;

	lp = &ip0->i_itemp->ili_item;

	if (lp && test_bit(XFS_LI_IN_AIL, &lp->li_flags)) {

		if (!xfs_ilock_nowait(ip1, xfs_lock_inumorder(ip1_mode, 1))) {

			xfs_iunlock(ip0, ip0_mode);