xfs
[Top] [All Lists]

[PATCH] xfs: remove int casts from debug dquot soft limit timer asserts

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfs: remove int casts from debug dquot soft limit timer asserts
From: Brian Foster <bfoster@xxxxxxxxxx>
Date: Fri, 21 Dec 2012 10:45:17 -0500
The int casts here make it easy to trigger an assert with a large
soft limit. For example, set a >4TB soft limit on an empty volume
to reproduce a (0 > -x) comparison due to an overflow of
d_blk_softlimit.

Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
---
 fs/xfs/xfs_qm_syscalls.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Hi guys,

I stumbled across this assert while messing around with setting a large quota
soft limit (e.g., set bsoft=5t and run report). Dave pointed me at the 
xfs-import
archive and the code originates here:

http://oss.sgi.com/cgi-bin/gitweb.cgi?p=archive/xfs-import.git;a=commit;h=0d5ad8383061fbc0a9804fbb98218750000fe032
(refer to xfs_qm_export_dquot())

It appears this code has always included these casts, either incorrectly or due
to no longer relevant historical reasons, and thus are safe to remove.

Brian

diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 5f53e75..8a59f85 100644
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -784,11 +784,11 @@ xfs_qm_scall_getquota(
             (XFS_IS_OQUOTA_ENFORCED(mp) &&
                        (dst->d_flags & (FS_PROJ_QUOTA | FS_GROUP_QUOTA)))) &&
            dst->d_id != 0) {
-               if (((int) dst->d_bcount > (int) dst->d_blk_softlimit) &&
+               if ((dst->d_bcount > dst->d_blk_softlimit) &&
                    (dst->d_blk_softlimit > 0)) {
                        ASSERT(dst->d_btimer != 0);
                }
-               if (((int) dst->d_icount > (int) dst->d_ino_softlimit) &&
+               if ((dst->d_icount > dst->d_ino_softlimit) &&
                    (dst->d_ino_softlimit > 0)) {
                        ASSERT(dst->d_itimer != 0);
                }
-- 
1.7.7.6

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] xfs: remove int casts from debug dquot soft limit timer asserts, Brian Foster <=