]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ceph: Convert to use jiffies macro
authorChen Yufan <chenyufan@vivo.com>
Thu, 22 Aug 2024 09:55:41 +0000 (17:55 +0800)
committerIlya Dryomov <idryomov@gmail.com>
Tue, 27 Aug 2024 07:30:09 +0000 (09:30 +0200)
Use time_after_eq macro instead of using
jiffies directly to handle wraparound.

[ xiubli: adjust the header files order ]

Signed-off-by: Chen Yufan <chenyufan@vivo.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
fs/ceph/caps.c

index 808c9c04827683ab069e86c617b7b90441e46552..6561a6cd94de25d296c86e4406f3d0557f1f77ea 100644 (file)
@@ -10,6 +10,7 @@
 #include <linux/writeback.h>
 #include <linux/iversion.h>
 #include <linux/filelock.h>
+#include <linux/jiffies.h>
 
 #include "super.h"
 #include "mds_client.h"
@@ -4659,7 +4660,7 @@ unsigned long ceph_check_delayed_caps(struct ceph_mds_client *mdsc)
                 * slowness doesn't block mdsc delayed work,
                 * preventing send_renew_caps() from running.
                 */
-               if (jiffies - loop_start >= 5 * HZ)
+               if (time_after_eq(jiffies, loop_start + 5 * HZ))
                        break;
        }
        spin_unlock(&mdsc->cap_delay_lock);