Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbf64b3d authored by Jan Kara's avatar Jan Kara
Browse files

xfs: Remove some useless flags tests 



'flags' have XFS_ALL_QUOTA_ACCT cleared immediately on function entry.
There's no point in checking these bits later in the function. Also
because we check something is going to change, we know some enforcement
bits are being added and thus there's no point in testing that later.

Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 8a2fdd4a

fs/xfs/xfs_qm_syscalls.c

+4 −11
Original line number Original line Diff line number Diff line
@@ -330,22 +330,16 @@ xfs_qm_scall_quotaon( 
		return -EINVAL;

		return -EINVAL;

	}

	}





	/* No fs can turn on quotas with a delayed effect */

	ASSERT((flags & XFS_ALL_QUOTA_ACCT) == 0);



	/*

	/*

	 * Can't enforce without accounting. We check the superblock

	 * Can't enforce without accounting. We check the superblock

	 * qflags here instead of m_qflags because rootfs can have

	 * qflags here instead of m_qflags because rootfs can have

	 * quota acct on ondisk without m_qflags' knowing.

	 * quota acct on ondisk without m_qflags' knowing.

	 */

	 */

	if (((flags & XFS_UQUOTA_ACCT) == 0 &&

	if (((mp->m_sb.sb_qflags & XFS_UQUOTA_ACCT) == 0 &&

	     (mp->m_sb.sb_qflags & XFS_UQUOTA_ACCT) == 0 &&

	     (flags & XFS_UQUOTA_ENFD)) ||

	     (flags & XFS_UQUOTA_ENFD)) ||

	    ((flags & XFS_GQUOTA_ACCT) == 0 &&

	    ((mp->m_sb.sb_qflags & XFS_GQUOTA_ACCT) == 0 &&

	     (mp->m_sb.sb_qflags & XFS_GQUOTA_ACCT) == 0 &&

	     (flags & XFS_GQUOTA_ENFD)) ||

	     (flags & XFS_GQUOTA_ENFD)) ||

	    ((flags & XFS_PQUOTA_ACCT) == 0 &&

	    ((mp->m_sb.sb_qflags & XFS_PQUOTA_ACCT) == 0 &&

	     (mp->m_sb.sb_qflags & XFS_PQUOTA_ACCT) == 0 &&

	     (flags & XFS_PQUOTA_ENFD))) {

	     (flags & XFS_PQUOTA_ENFD))) {

		xfs_debug(mp,

		xfs_debug(mp,

			"%s: Can't enforce without acct, flags=%x sbflags=%x",

			"%s: Can't enforce without acct, flags=%x sbflags=%x",
@@ -384,8 +378,7 @@ xfs_qm_scall_quotaon( 
	     ((mp->m_sb.sb_qflags & XFS_PQUOTA_ACCT) !=

	     ((mp->m_sb.sb_qflags & XFS_PQUOTA_ACCT) !=

	     (mp->m_qflags & XFS_PQUOTA_ACCT)) ||

	     (mp->m_qflags & XFS_PQUOTA_ACCT)) ||

	     ((mp->m_sb.sb_qflags & XFS_GQUOTA_ACCT) !=

	     ((mp->m_sb.sb_qflags & XFS_GQUOTA_ACCT) !=

	     (mp->m_qflags & XFS_GQUOTA_ACCT)) ||

	     (mp->m_qflags & XFS_GQUOTA_ACCT)))

	    (flags & XFS_ALL_QUOTA_ENFD) == 0)

		return 0;

		return 0;





	if (! XFS_IS_QUOTA_RUNNING(mp))

	if (! XFS_IS_QUOTA_RUNNING(mp))