Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux.git] / fs / xfs / xfs_trans_dquot.c

diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
index a6fe2d8dc40f38307f643360a84c80e5eaa6360b..d1b9869bc5fa61f723947da51199b708a809b394 100644 (file)
--- a/fs/xfs/xfs_trans_dquot.c
+++ b/fs/xfs/xfs_trans_dquot.c
@@ -580,7 +580,7 @@ xfs_trans_dqresv(
 {
        xfs_qcnt_t              hardlimit;
        xfs_qcnt_t              softlimit;
-       time_t                  timer;
+       time64_t                timer;
        xfs_qwarncnt_t          warns;
        xfs_qwarncnt_t          warnlimit;
        xfs_qcnt_t              total_count;
@@ -635,7 +635,8 @@ xfs_trans_dqresv(
                                goto error_return;
                        }
                        if (softlimit && total_count > softlimit) {
-                               if ((timer != 0 && get_seconds() > timer) ||
+                               if ((timer != 0 &&
+                                    ktime_get_real_seconds() > timer) ||
                                    (warns != 0 && warns >= warnlimit)) {
                                        xfs_quota_warn(mp, dqp,
                                                       QUOTA_NL_BSOFTLONGWARN);
@@ -662,7 +663,8 @@ xfs_trans_dqresv(
                                goto error_return;
                        }
                        if (softlimit && total_count > softlimit) {
-                               if  ((timer != 0 && get_seconds() > timer) ||
+                               if  ((timer != 0 &&
+                                     ktime_get_real_seconds() > timer) ||
                                     (warns != 0 && warns >= warnlimit)) {
                                        xfs_quota_warn(mp, dqp,
                                                       QUOTA_NL_ISOFTLONGWARN);