]> git.karo-electronics.de Git - linux-beck.git/commitdiff
xfs: check for null dquot in xfs_quota_calc_throttle()
authorEric Sandeen <sandeen@redhat.com>
Wed, 1 Oct 2014 23:27:09 +0000 (09:27 +1000)
committerDave Chinner <david@fromorbit.com>
Wed, 1 Oct 2014 23:27:09 +0000 (09:27 +1000)
Coverity spotted this.

Granted, we *just* checked xfs_inod_dquot() in the caller (by
calling xfs_quota_need_throttle). However, this is the only place we
don't check the return value but the check is cheap and future-proof
so add it.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
fs/xfs/xfs_iomap.c

index e9c47b6f5e5a97f3b100a4a6262a1c26a1b01de9..afcf3c926565f940e2986093e7e3491296466d9b 100644 (file)
@@ -404,8 +404,8 @@ xfs_quota_calc_throttle(
        int shift = 0;
        struct xfs_dquot *dq = xfs_inode_dquot(ip, type);
 
-       /* over hi wmark, squash the prealloc completely */
-       if (dq->q_res_bcount >= dq->q_prealloc_hi_wmark) {
+       /* no dq, or over hi wmark, squash the prealloc completely */
+       if (!dq || dq->q_res_bcount >= dq->q_prealloc_hi_wmark) {
                *qblocks = 0;
                *qfreesp = 0;
                return;