summary refs log tree commit diff
path: root/fs/xfs/xfs_qm.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2014-12-01 09:03:02 +1100
committerDave Chinner <david@fromorbit.com>2014-12-01 09:03:02 +1100
commitc14fc01340dd0afe58d8671acc3ea5e907e707ae (patch)
tree15d26839e5ab12a186e1ad7265020ba6112ac639 /fs/xfs/xfs_qm.c
parent216875a594e0b4fc72830e3690b8fbe7430738e2 (diff)
parentd254aaec5d1aa2997dad035db340c298eaa8d089 (diff)
downloadlinux-c14fc01340dd0afe58d8671acc3ea5e907e707ae.tar.gz
Merge branch 'xfs-coccinelle-cleanups' into for-next
Diffstat (limited to 'fs/xfs/xfs_qm.c')
-rw-r--r--fs/xfs/xfs_qm.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 26d4a8d89dfa..79fb19dd9c83 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -1747,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;
 }