diff --git a/fs/xfs/xfs_buf_item_recover.c b/fs/xfs/xfs_buf_item_recover.c
index d214e0f9cc092e5ddd2ada58eec1e7db9686dde4..eb75a953b09e3f5b84fad0590e8588a1c48446ba 100644
--- a/fs/xfs/xfs_buf_item_recover.c
+++ b/fs/xfs/xfs_buf_item_recover.c
@@ -980,20 +980,21 @@ xlog_recover_buf_commit_pass2(
 			bp->b_ops->verify_write(bp);
 			error = bp->b_error;
 			if (error)
-				goto out_release;
+				goto out_writebuf;
 
 			if (be32_to_cpu(sb->sb_agcount) > mp->m_sb.sb_agcount) {
 				error = xfs_initialize_perag(mp,
 						be32_to_cpu(sb->sb_agcount),
 						&mp->m_maxagi);
 				if (error)
-					goto out_release;
+					goto out_writebuf;
 			}
 
 			xfs_sb_from_disk(&mp->m_sb, sb);
 		}
 	}
 
+out_writebuf:
 	/*
 	 * Perform delayed write on the buffer.  Asynchronous writes will be
 	 * slower when taking into account all the buffers to be flushed.