1 files changed, 10 insertions, 12 deletions

diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index bda774a04b8f..52c41714ec54 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -51,7 +51,6 @@
 #include "xfs_refcache.h"
 #include "xfs_trans_space.h"
 #include "xfs_log_priv.h"
-#include "xfs_mac.h"
 
 STATIC int
 xfs_open(
@@ -1381,7 +1380,7 @@ xfs_inactive_symlink_rmt(
         /*
          * Commit the first transaction.  This logs the EFI and the inode.
          */
-        if ((error = xfs_bmap_finish(&tp, &free_list, first_block, &committed)))
+        if ((error = xfs_bmap_finish(&tp, &free_list, &committed)))
                 goto error1;
         /*
          * The transaction must have been committed, since there were
@@ -1790,8 +1789,7 @@ xfs_inactive(
                  * Just ignore errors at this point.  There is
                  * nothing we can do except to try to keep going.
                  */
-                (void) xfs_bmap_finish(&tp,  &free_list, first_block,
-                                       &committed);
+                (void) xfs_bmap_finish(&tp,  &free_list, &committed);
                 (void) xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL);
         }
         /*
@@ -2022,7 +2020,7 @@ xfs_create(
         IHOLD(ip);
         vp = XFS_ITOV(ip);
 
-        error = xfs_bmap_finish(&tp, &free_list, first_block, &committed);
+        error = xfs_bmap_finish(&tp, &free_list, &committed);
         if (error) {
                 xfs_bmap_cancel(&free_list);
                 goto abort_rele;
@@ -2507,7 +2505,7 @@ xfs_remove(
                 xfs_trans_set_sync(tp);
         }
 
-        error = xfs_bmap_finish(&tp, &free_list, first_block, &committed);
+        error = xfs_bmap_finish(&tp, &free_list, &committed);
         if (error) {
                 REMOVE_DEBUG_TRACE(__LINE__);
                 goto error_rele;
@@ -2715,7 +2713,7 @@ xfs_link(
                 xfs_trans_set_sync(tp);
         }
 
-        error = xfs_bmap_finish (&tp, &free_list, first_block, &committed);
+        error = xfs_bmap_finish (&tp, &free_list, &committed);
         if (error) {
                 xfs_bmap_cancel(&free_list);
                 goto abort_return;
@@ -2932,7 +2930,7 @@ xfs_mkdir(
                 xfs_trans_set_sync(tp);
         }
 
-        error = xfs_bmap_finish(&tp, &free_list, first_block, &committed);
+        error = xfs_bmap_finish(&tp, &free_list, &committed);
         if (error) {
                 IRELE(cdp);
                 goto error2;
@@ -3183,7 +3181,7 @@ xfs_rmdir(
                 xfs_trans_set_sync(tp);
         }
 
-        error = xfs_bmap_finish (&tp, &free_list, first_block, &committed);
+        error = xfs_bmap_finish (&tp, &free_list, &committed);
         if (error) {
                 xfs_bmap_cancel(&free_list);
                 xfs_trans_cancel(tp, (XFS_TRANS_RELEASE_LOG_RES |
@@ -3533,7 +3531,7 @@ xfs_symlink(
          */
         IHOLD(ip);
 
-        error = xfs_bmap_finish(&tp, &free_list, first_block, &committed);
+        error = xfs_bmap_finish(&tp, &free_list, &committed);
         if (error) {
                 goto error2;
         }
@@ -4145,7 +4143,7 @@ retry:
                 /*
                  * Complete the transaction
                  */
-                error = xfs_bmap_finish(&tp, &free_list, firstfsb, &committed);
+                error = xfs_bmap_finish(&tp, &free_list, &committed);
                 if (error) {
                         goto error0;
                 }
@@ -4452,7 +4450,7 @@ xfs_free_file_space(
                 /*
                  * complete the transaction
                  */
-                error = xfs_bmap_finish(&tp, &free_list, firstfsb, &committed);
+                error = xfs_bmap_finish(&tp, &free_list, &committed);
                 if (error) {
                         goto error0;
                 }