1 files changed, 42 insertions, 18 deletions

diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 9153d2c77caf..1c6fdeb702ff 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -194,6 +194,10 @@ xfs_growfs_data_private(
                 bp = xfs_buf_get(mp->m_ddev_targp,
                                  XFS_AG_DADDR(mp, agno, XFS_AGF_DADDR(mp)),
                                  XFS_FSS_TO_BB(mp, 1), XBF_LOCK | XBF_MAPPED);
+                if (!bp) {
+                        error = ENOMEM;
+                        goto error0;
+                }
                 agf = XFS_BUF_TO_AGF(bp);
                 memset(agf, 0, mp->m_sb.sb_sectsize);
                 agf->agf_magicnum = cpu_to_be32(XFS_AGF_MAGIC);
@@ -216,16 +220,21 @@ xfs_growfs_data_private(
                 tmpsize = agsize - XFS_PREALLOC_BLOCKS(mp);
                 agf->agf_freeblks = cpu_to_be32(tmpsize);
                 agf->agf_longest = cpu_to_be32(tmpsize);
-                error = xfs_bwrite(mp, bp);
-                if (error) {
+                error = xfs_bwrite(bp);
+                xfs_buf_relse(bp);
+                if (error)
                         goto error0;
-                }
+
                 /*
                  * AG inode header block
                  */
                 bp = xfs_buf_get(mp->m_ddev_targp,
                                  XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp)),
                                  XFS_FSS_TO_BB(mp, 1), XBF_LOCK | XBF_MAPPED);
+                if (!bp) {
+                        error = ENOMEM;
+                        goto error0;
+                }
                 agi = XFS_BUF_TO_AGI(bp);
                 memset(agi, 0, mp->m_sb.sb_sectsize);
                 agi->agi_magicnum = cpu_to_be32(XFS_AGI_MAGIC);
@@ -240,10 +249,11 @@ xfs_growfs_data_private(
                 agi->agi_dirino = cpu_to_be32(NULLAGINO);
                 for (bucket = 0; bucket < XFS_AGI_UNLINKED_BUCKETS; bucket++)
                         agi->agi_unlinked[bucket] = cpu_to_be32(NULLAGINO);
-                error = xfs_bwrite(mp, bp);
-                if (error) {
+                error = xfs_bwrite(bp);
+                xfs_buf_relse(bp);
+                if (error)
                         goto error0;
-                }
+
                 /*
                  * BNO btree root block
                  */
@@ -251,6 +261,10 @@ xfs_growfs_data_private(
                                  XFS_AGB_TO_DADDR(mp, agno, XFS_BNO_BLOCK(mp)),
                                  BTOBB(mp->m_sb.sb_blocksize),
                                  XBF_LOCK | XBF_MAPPED);
+                if (!bp) {
+                        error = ENOMEM;
+                        goto error0;
+                }
                 block = XFS_BUF_TO_BLOCK(bp);
                 memset(block, 0, mp->m_sb.sb_blocksize);
                 block->bb_magic = cpu_to_be32(XFS_ABTB_MAGIC);
@@ -262,10 +276,11 @@ xfs_growfs_data_private(
                 arec->ar_startblock = cpu_to_be32(XFS_PREALLOC_BLOCKS(mp));
                 arec->ar_blockcount = cpu_to_be32(
                         agsize - be32_to_cpu(arec->ar_startblock));
-                error = xfs_bwrite(mp, bp);
-                if (error) {
+                error = xfs_bwrite(bp);
+                xfs_buf_relse(bp);
+                if (error)
                         goto error0;
-                }
+
                 /*
                  * CNT btree root block
                  */
@@ -273,6 +288,10 @@ xfs_growfs_data_private(
                                  XFS_AGB_TO_DADDR(mp, agno, XFS_CNT_BLOCK(mp)),
                                  BTOBB(mp->m_sb.sb_blocksize),
                                  XBF_LOCK | XBF_MAPPED);
+                if (!bp) {
+                        error = ENOMEM;
+                        goto error0;
+                }
                 block = XFS_BUF_TO_BLOCK(bp);
                 memset(block, 0, mp->m_sb.sb_blocksize);
                 block->bb_magic = cpu_to_be32(XFS_ABTC_MAGIC);
@@ -285,10 +304,11 @@ xfs_growfs_data_private(
                 arec->ar_blockcount = cpu_to_be32(
                         agsize - be32_to_cpu(arec->ar_startblock));
                 nfree += be32_to_cpu(arec->ar_blockcount);
-                error = xfs_bwrite(mp, bp);
-                if (error) {
+                error = xfs_bwrite(bp);
+                xfs_buf_relse(bp);
+                if (error)
                         goto error0;
-                }
+
                 /*
                  * INO btree root block
                  */
@@ -296,6 +316,10 @@ xfs_growfs_data_private(
                                  XFS_AGB_TO_DADDR(mp, agno, XFS_IBT_BLOCK(mp)),
                                  BTOBB(mp->m_sb.sb_blocksize),
                                  XBF_LOCK | XBF_MAPPED);
+                if (!bp) {
+                        error = ENOMEM;
+                        goto error0;
+                }
                 block = XFS_BUF_TO_BLOCK(bp);
                 memset(block, 0, mp->m_sb.sb_blocksize);
                 block->bb_magic = cpu_to_be32(XFS_IBT_MAGIC);
@@ -303,10 +327,10 @@ xfs_growfs_data_private(
                 block->bb_numrecs = 0;
                 block->bb_u.s.bb_leftsib = cpu_to_be32(NULLAGBLOCK);
                 block->bb_u.s.bb_rightsib = cpu_to_be32(NULLAGBLOCK);
-                error = xfs_bwrite(mp, bp);
-                if (error) {
+                error = xfs_bwrite(bp);
+                xfs_buf_relse(bp);
+                if (error)
                         goto error0;
-                }
         }
         xfs_trans_agblocks_delta(tp, nfree);
         /*
@@ -396,9 +420,9 @@ xfs_growfs_data_private(
                  * just issue a warning and continue.  The real work is
                  * already done and committed.
                  */
-                if (!(error = xfs_bwrite(mp, bp))) {
-                        continue;
-                } else {
+                error = xfs_bwrite(bp);
+                xfs_buf_relse(bp);
+                if (error) {
                         xfs_warn(mp,
                 "write error %d updating secondary superblock for ag %d",
                                 error, agno);