1 files changed, 6 insertions, 17 deletions

diff --git a/fs/xfs/xfs_trans_extfree.c b/fs/xfs/xfs_trans_extfree.c
index 27cce2a9c7e9..f783d5e9fa70 100644
--- a/fs/xfs/xfs_trans_extfree.c
+++ b/fs/xfs/xfs_trans_extfree.c
@@ -23,7 +23,6 @@
 #include "xfs_trans.h"
 #include "xfs_sb.h"
 #include "xfs_ag.h"
-#include "xfs_dmapi.h"
 #include "xfs_mount.h"
 #include "xfs_trans_priv.h"
 #include "xfs_extfree_item.h"
@@ -49,9 +48,8 @@ xfs_trans_get_efi(xfs_trans_t	*tp,
         /*
          * Get a log_item_desc to point at the new item.
          */
-        (void) xfs_trans_add_item(tp, (xfs_log_item_t*)efip);
-
-        return (efip);
+        xfs_trans_add_item(tp, &efip->efi_item);
+        return efip;
 }
 
 /*
@@ -65,15 +63,11 @@ xfs_trans_log_efi_extent(xfs_trans_t		*tp,
                          xfs_fsblock_t          start_block,
                          xfs_extlen_t           ext_len)
 {
-        xfs_log_item_desc_t     *lidp;
         uint                    next_extent;
         xfs_extent_t            *extp;
 
-        lidp = xfs_trans_find_item(tp, (xfs_log_item_t*)efip);
-        ASSERT(lidp != NULL);
-
         tp->t_flags |= XFS_TRANS_DIRTY;
-        lidp->lid_flags |= XFS_LID_DIRTY;
+        efip->efi_item.li_desc->lid_flags |= XFS_LID_DIRTY;
 
         next_extent = efip->efi_next_extent;
         ASSERT(next_extent < efip->efi_format.efi_nextents);
@@ -106,9 +100,8 @@ xfs_trans_get_efd(xfs_trans_t		*tp,
         /*
          * Get a log_item_desc to point at the new item.
          */
-        (void) xfs_trans_add_item(tp, (xfs_log_item_t*)efdp);
-
-        return (efdp);
+        xfs_trans_add_item(tp, &efdp->efd_item);
+        return efdp;
 }
 
 /*
@@ -122,15 +115,11 @@ xfs_trans_log_efd_extent(xfs_trans_t		*tp,
                          xfs_fsblock_t          start_block,
                          xfs_extlen_t           ext_len)
 {
-        xfs_log_item_desc_t     *lidp;
         uint                    next_extent;
         xfs_extent_t            *extp;
 
-        lidp = xfs_trans_find_item(tp, (xfs_log_item_t*)efdp);
-        ASSERT(lidp != NULL);
-
         tp->t_flags |= XFS_TRANS_DIRTY;
-        lidp->lid_flags |= XFS_LID_DIRTY;
+        efdp->efd_item.li_desc->lid_flags |= XFS_LID_DIRTY;
 
         next_extent = efdp->efd_next_extent;
         ASSERT(next_extent < efdp->efd_format.efd_nextents);