Merge branch 'next' into for-linus

1 files changed, 9 insertions, 6 deletions

diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c
index 9f24ec28283b..169380e66057 100644
--- a/fs/xfs/xfs_ialloc.c
+++ b/fs/xfs/xfs_ialloc.c
@@ -150,7 +150,7 @@ xfs_check_agi_freecount(
 /*
  * Initialise a new set of inodes.
  */
-STATIC void
+STATIC int
 xfs_ialloc_inode_init(
         struct xfs_mount        *mp,
         struct xfs_trans        *tp,
@@ -202,8 +202,8 @@ xfs_ialloc_inode_init(
                 fbuf = xfs_trans_get_buf(tp, mp->m_ddev_targp, d,
                                          mp->m_bsize * blks_per_cluster,
                                          XBF_LOCK);
-                ASSERT(!xfs_buf_geterror(fbuf));
-
+                if (!fbuf)
+                        return ENOMEM;
                 /*
                  * Initialize all inodes in this buffer and then log them.
                  *
@@ -225,6 +225,7 @@ xfs_ialloc_inode_init(
                 }
                 xfs_trans_inode_alloc_buf(tp, fbuf);
         }
+        return 0;
 }
 
 /*
@@ -369,9 +370,11 @@ xfs_ialloc_ag_alloc(
          * rather than a linear progression to prevent the next generation
          * number from being easily guessable.
          */
-        xfs_ialloc_inode_init(args.mp, tp, agno, args.agbno, args.len,
-                              random32());
+        error = xfs_ialloc_inode_init(args.mp, tp, agno, args.agbno,
+                        args.len, random32());
 
+        if (error)
+                return error;
         /*
          * Convert the results.
          */
@@ -1502,7 +1505,7 @@ xfs_read_agi(
                 return XFS_ERROR(EFSCORRUPTED);
         }
 
-        XFS_BUF_SET_VTYPE_REF(*bpp, B_FS_AGI, XFS_AGI_REF);
+        xfs_buf_set_ref(*bpp, XFS_AGI_REF);
 
         xfs_check_agi_unlinked(agi);
         return 0;