| Message ID | 20240822095541.121094-1-chenyufan@vivo.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] ceph: Convert to use jiffies macro | expand |
On 8/22/24 17:55, Chen Yufan wrote: > Use time_after_eq macro instead of using > jiffies directly to handle wraparound. > The modifications made compared to the previous version are as follows: > 1. Remove extra '+' in the header. > > Signed-off-by: Chen Yufan <chenyufan@vivo.com> > --- > fs/ceph/caps.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c > index 808c9c048..6a55825c3 100644 > --- a/fs/ceph/caps.c > +++ b/fs/ceph/caps.c > @@ -17,6 +17,7 @@ > #include "crypto.h" > #include <linux/ceph/decode.h> > #include <linux/ceph/messenger.h> > +#include <linux/jiffies.h> > > /* > * Capability management > @@ -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); Hi Yufan, Thanks for your patch and this LGTM. Reviewed-by: Xiubo Li <xiubli@redhat.com> Will apply to the 'testing' branch with an adjustment of the header files order. Thanks - Xiubo
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 808c9c048..6a55825c3 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -17,6 +17,7 @@ #include "crypto.h" #include <linux/ceph/decode.h> #include <linux/ceph/messenger.h> +#include <linux/jiffies.h> /* * Capability management @@ -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);
Use time_after_eq macro instead of using jiffies directly to handle wraparound. The modifications made compared to the previous version are as follows: 1. Remove extra '+' in the header. Signed-off-by: Chen Yufan <chenyufan@vivo.com> --- fs/ceph/caps.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)