1 files changed, 7 insertions, 3 deletions

diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index ddd45e5b9383..2251a49f3e17 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -177,6 +177,7 @@ xfs_growfs_data_private(
                 up_write(&mp->m_peraglock);
         }
         tp = xfs_trans_alloc(mp, XFS_TRANS_GROWFS);
+        tp->t_flags |= XFS_TRANS_RESERVE;
         if ((error = xfs_trans_reserve(tp, XFS_GROWFS_SPACE_RES(mp),
                         XFS_GROWDATA_LOG_RES(mp), 0, 0, 0))) {
                 xfs_trans_cancel(tp, 0);
@@ -499,8 +500,9 @@ xfs_reserve_blocks(
         unsigned long           s;
 
         /* If inval is null, report current values and return */
-
         if (inval == (__uint64_t *)NULL) {
+                if (!outval)
+                        return EINVAL;
                 outval->resblks = mp->m_resblks;
                 outval->resblks_avail = mp->m_resblks_avail;
                 return 0;
@@ -563,8 +565,10 @@ retry:
                 }
         }
 out:
-        outval->resblks = mp->m_resblks;
-        outval->resblks_avail = mp->m_resblks_avail;
+        if (outval) {
+                outval->resblks = mp->m_resblks;
+                outval->resblks_avail = mp->m_resblks_avail;
+        }
         XFS_SB_UNLOCK(mp, s);
 
         if (fdblks_delta) {