diff options
| author | Brian Foster <bfoster@redhat.com> | 2012-12-21 10:45:17 -0500 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2013-01-16 16:08:40 -0600 |
| commit | ab7eac22008f044631c0a3f4be344ebc2cb0e266 (patch) | |
| tree | 01a714d7293f62232ce4319b6d29efa1a7e0a2b9 /fs/xfs | |
| parent | 91e4bac0b72736410c88632906953f14259144b1 (diff) | |
| download | linux-3.10-ab7eac22008f044631c0a3f4be344ebc2cb0e266.tar.gz linux-3.10-ab7eac22008f044631c0a3f4be344ebc2cb0e266.tar.bz2 linux-3.10-ab7eac22008f044631c0a3f4be344ebc2cb0e266.zip | |
xfs: remove int casts from debug dquot soft limit timer asserts
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@redhat.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/xfs_qm_syscalls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c index 5f53e75409b..8a59f854655 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); } |