1 files changed, 12 insertions, 6 deletions

diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 437c9198031a..3daf5ea1eb8d 100644
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -278,7 +278,7 @@ xfs_qm_scall_trunc_qfiles(
         xfs_mount_t     *mp,
         uint            flags)
 {
-        int             error = 0, error2 = 0;
+        int             error;
 
         if (!xfs_sb_version_hasquota(&mp->m_sb) || flags == 0) {
                 xfs_debug(mp, "%s: flags=%x m_qflags=%x",
@@ -286,14 +286,20 @@ xfs_qm_scall_trunc_qfiles(
                 return XFS_ERROR(EINVAL);
         }
 
-        if (flags & XFS_DQ_USER)
+        if (flags & XFS_DQ_USER) {
                 error = xfs_qm_scall_trunc_qfile(mp, mp->m_sb.sb_uquotino);
-        if (flags & XFS_DQ_GROUP)
-                error2 = xfs_qm_scall_trunc_qfile(mp, mp->m_sb.sb_gquotino);
+                if (error)
+                        return error;
+        }
+        if (flags & XFS_DQ_GROUP) {
+                error = xfs_qm_scall_trunc_qfile(mp, mp->m_sb.sb_gquotino);
+                if (error)
+                        return error;
+        }
         if (flags & XFS_DQ_PROJ)
-                error2 = xfs_qm_scall_trunc_qfile(mp, mp->m_sb.sb_pquotino);
+                error = xfs_qm_scall_trunc_qfile(mp, mp->m_sb.sb_pquotino);
 
-        return error ? error : error2;
+        return error;
 }
 
 /*