| Message ID | 20241115-converge-secs-to-jiffies-v2-18-911fb7595e79@linux.microsoft.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,01/21] netfilter: conntrack: Cleanup timeout definitions | expand |
looks good On Sat, Nov 16, 2024 at 12:32 AM Easwar Hariharan <eahariha@linux.microsoft.com> wrote: > > Changes made with the following Coccinelle rules: > > @@ constant C; @@ > > - msecs_to_jiffies(C * 1000) > + secs_to_jiffies(C) > > @@ constant C; @@ > > - msecs_to_jiffies(C * MSEC_PER_SEC) > + secs_to_jiffies(C) > > Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> > --- > fs/ceph/quota.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/ceph/quota.c b/fs/ceph/quota.c > index 06ee397e0c3a6172592e62dba95cd267cfff0db1..d90eda19bcc4618f98bfed833c10a6071cf2e2ac 100644 > --- a/fs/ceph/quota.c > +++ b/fs/ceph/quota.c > @@ -166,7 +166,7 @@ static struct inode *lookup_quotarealm_inode(struct ceph_mds_client *mdsc, > if (IS_ERR(in)) { > doutc(cl, "Can't lookup inode %llx (err: %ld)\n", realm->ino, > PTR_ERR(in)); > - qri->timeout = jiffies + msecs_to_jiffies(60 * 1000); /* XXX */ > + qri->timeout = jiffies + secs_to_jiffies(60); /* XXX */ > } else { > qri->timeout = 0; > qri->inode = in; > > -- > 2.34.1 > >
diff --git a/fs/ceph/quota.c b/fs/ceph/quota.c index 06ee397e0c3a6172592e62dba95cd267cfff0db1..d90eda19bcc4618f98bfed833c10a6071cf2e2ac 100644 --- a/fs/ceph/quota.c +++ b/fs/ceph/quota.c @@ -166,7 +166,7 @@ static struct inode *lookup_quotarealm_inode(struct ceph_mds_client *mdsc, if (IS_ERR(in)) { doutc(cl, "Can't lookup inode %llx (err: %ld)\n", realm->ino, PTR_ERR(in)); - qri->timeout = jiffies + msecs_to_jiffies(60 * 1000); /* XXX */ + qri->timeout = jiffies + secs_to_jiffies(60); /* XXX */ } else { qri->timeout = 0; qri->inode = in;
Changes made with the following Coccinelle rules: @@ constant C; @@ - msecs_to_jiffies(C * 1000) + secs_to_jiffies(C) @@ constant C; @@ - msecs_to_jiffies(C * MSEC_PER_SEC) + secs_to_jiffies(C) Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> --- fs/ceph/quota.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)