1 files changed, 5 insertions, 9 deletions

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index d68f23021af3..79fb19dd9c83 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -23,7 +23,6 @@
 #include "xfs_trans_resv.h"
 #include "xfs_bit.h"
 #include "xfs_sb.h"
-#include "xfs_ag.h"
 #include "xfs_mount.h"
 #include "xfs_inode.h"
 #include "xfs_ialloc.h"
@@ -38,7 +37,6 @@
 #include "xfs_trace.h"
 #include "xfs_icache.h"
 #include "xfs_cksum.h"
-#include "xfs_dinode.h"
 
 /*
  * The global quota manager. There is only one of these for the entire
@@ -1749,23 +1747,21 @@ xfs_qm_vop_dqalloc(
         xfs_iunlock(ip, lockflags);
         if (O_udqpp)
                 *O_udqpp = uq;
-        else if (uq)
+        else
                 xfs_qm_dqrele(uq);
         if (O_gdqpp)
                 *O_gdqpp = gq;
-        else if (gq)
+        else
                 xfs_qm_dqrele(gq);
         if (O_pdqpp)
                 *O_pdqpp = pq;
-        else if (pq)
+        else
                 xfs_qm_dqrele(pq);
         return 0;
 
 error_rele:
-        if (gq)
-                xfs_qm_dqrele(gq);
-        if (uq)
-                xfs_qm_dqrele(uq);
+        xfs_qm_dqrele(gq);
+        xfs_qm_dqrele(uq);
         return error;
 }