1 files changed, 14 insertions, 14 deletions

diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
index 98dc670d3ee0..6f9e63c9fc26 100644
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -17,25 +17,24 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
-#include "xfs_types.h"
+#include "xfs_format.h"
 #include "xfs_bit.h"
 #include "xfs_log.h"
 #include "xfs_trans.h"
 #include "xfs_sb.h"
 #include "xfs_ag.h"
-#include "xfs_dir2.h"
 #include "xfs_mount.h"
 #include "xfs_bmap_btree.h"
 #include "xfs_dinode.h"
 #include "xfs_inode.h"
 #include "xfs_alloc.h"
 #include "xfs_bmap.h"
+#include "xfs_bmap_util.h"
 #include "xfs_rtalloc.h"
 #include "xfs_fsops.h"
 #include "xfs_error.h"
 #include "xfs_inode_item.h"
 #include "xfs_trans_space.h"
-#include "xfs_utils.h"
 #include "xfs_trace.h"
 #include "xfs_buf.h"
 #include "xfs_icache.h"
@@ -101,10 +100,9 @@ xfs_growfs_rt_alloc(
                 /*
                  * Reserve space & log for one extent added to the file.
                  */
-                if ((error = xfs_trans_reserve(tp, resblks,
-                                XFS_GROWRTALLOC_LOG_RES(mp), 0,
-                                XFS_TRANS_PERM_LOG_RES,
-                                XFS_DEFAULT_PERM_LOG_COUNT)))
+                error = xfs_trans_reserve(tp, &M_RES(mp)->tr_growdata,
+                                          resblks, 0);
+                if (error)
                         goto error_cancel;
                 cancelflags = XFS_TRANS_RELEASE_LOG_RES;
                 /*
@@ -147,8 +145,9 @@ xfs_growfs_rt_alloc(
                         /*
                          * Reserve log for one block zeroing.
                          */
-                        if ((error = xfs_trans_reserve(tp, 0,
-                                        XFS_GROWRTZERO_LOG_RES(mp), 0, 0, 0)))
+                        error = xfs_trans_reserve(tp, &M_RES(mp)->tr_growrtzero,
+                                                  0, 0);
+                        if (error)
                                 goto error_cancel;
                         /*
                          * Lock the bitmap inode.
@@ -736,8 +735,8 @@ xfs_rtallocate_range(
 {
         xfs_rtblock_t   end;            /* end of the allocated extent */
         int             error;          /* error value */
-        xfs_rtblock_t   postblock;      /* first block allocated > end */
-        xfs_rtblock_t   preblock;       /* first block allocated < start */
+        xfs_rtblock_t   postblock = 0;  /* first block allocated > end */
+        xfs_rtblock_t   preblock = 0;   /* first block allocated < start */
 
         end = start + len - 1;
         /*
@@ -1958,8 +1957,9 @@ xfs_growfs_rt(
                  * Start a transaction, get the log reservation.
                  */
                 tp = xfs_trans_alloc(mp, XFS_TRANS_GROWFSRT_FREE);
-                if ((error = xfs_trans_reserve(tp, 0,
-                                XFS_GROWRTFREE_LOG_RES(nmp), 0, 0, 0)))
+                error = xfs_trans_reserve(tp, &M_RES(mp)->tr_growrtfree,
+                                          0, 0);
+                if (error)
                         goto error_cancel;
                 /*
                  * Lock out other callers by grabbing the bitmap inode lock.
@@ -2148,7 +2148,7 @@ xfs_rtfree_extent(
         ASSERT(mp->m_rbmip->i_itemp != NULL);
         ASSERT(xfs_isilocked(mp->m_rbmip, XFS_ILOCK_EXCL));
 
-#if defined(__KERNEL__) && defined(DEBUG)
+#ifdef DEBUG
         /*
          * Check to see that this whole range is currently allocated.
          */