The quilt patch titled
Subject: libceph: convert timeouts to secs_to_jiffies()
has been removed from the -mm tree. Its filename was
libceph-convert-timeouts-to-secs_to_jiffies.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Easwar Hariharan <eahariha@xxxxxxxxxxxxxxxxxxx>
Subject: libceph: convert timeouts to secs_to_jiffies()
Date: Tue, 25 Feb 2025 20:17:21 +0000
Commit b35108a51cf7 ("jiffies: Define secs_to_jiffies()") introduced
secs_to_jiffies(). As the value here is a multiple of 1000, use
secs_to_jiffies() instead of msecs_to_jiffies() to avoid the
multiplication
This is converted using scripts/coccinelle/misc/secs_to_jiffies.cocci with
the following Coccinelle rules:
@depends on patch@ expression E; @@
-msecs_to_jiffies(E * 1000)
+secs_to_jiffies(E)
@depends on patch@ expression E; @@
-msecs_to_jiffies(E * MSEC_PER_SEC)
+secs_to_jiffies(E)
While here, remove the no-longer necessary checks for range since there's
no multiplication involved.
Link: https://lkml.kernel.org/r/20250225-converge-secs-to-jiffies-part-two-v3-7-a43967e36c88@xxxxxxxxxxxxxxxxxxx
Signed-off-by: Easwar Hariharan <eahariha@xxxxxxxxxxxxxxxxxxx>
Acked-by: Ilya Dryomov <idryomov@xxxxxxxxx>
Cc: Carlos Maiolino <cem@xxxxxxxxxx>
Cc: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
Cc: Chris Mason <clm@xxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: Damien Le Maol <dlemoal@xxxxxxxxxx>
Cc: "Darrick J. Wong" <djwong@xxxxxxxxxx>
Cc: David Sterba <dsterba@xxxxxxxx>
Cc: Dick Kennedy <dick.kennedy@xxxxxxxxxxxx>
Cc: Dongsheng Yang <dongsheng.yang@xxxxxxxxxxxx>
Cc: Fabio Estevam <festevam@xxxxxxxxx>
Cc: Frank Li <frank.li@xxxxxxx>
Cc: Hans de Goede <hdegoede@xxxxxxxxxx>
Cc: Henrique de Moraes Holschuh <hmh@xxxxxxxxxx>
Cc: Ilpo Jarvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>
Cc: James Bottomley <james.bottomley@xxxxxxxxxxxxxxxxxxxxx>
Cc: James Smart <james.smart@xxxxxxxxxxxx>
Cc: Jaroslav Kysela <perex@xxxxxxxx>
Cc: Jason Gunthorpe <jgg@xxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Cc: Josef Bacik <josef@xxxxxxxxxxxxxx>
Cc: Julia Lawall <julia.lawall@xxxxxxxx>
Cc: Kalesh Anakkur Purayil <kalesh-anakkur.purayil@xxxxxxxxxxxx>
Cc: Keith Busch <kbusch@xxxxxxxxxx>
Cc: Leon Romanovsky <leon@xxxxxxxxxx>
Cc: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
Cc: Mark Brown <broonie@xxxxxxxxxx>
Cc: "Martin K. Petersen" <martin.petersen@xxxxxxxxxx>
Cc: Nicolas Palix <nicolas.palix@xxxxxxx>
Cc: Niklas Cassel <cassel@xxxxxxxxxx>
Cc: Oded Gabbay <ogabbay@xxxxxxxxxx>
Cc: Sagi Grimberg <sagi@xxxxxxxxxxx>
Cc: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Cc: Sebastian Reichel <sre@xxxxxxxxxx>
Cc: Selvin Thyparampil Xavier <selvin.xavier@xxxxxxxxxxxx>
Cc: Shawn Guo <shawnguo@xxxxxxxxxx>
Cc: Shyam-sundar S-k <Shyam-sundar.S-k@xxxxxxx>
Cc: Takashi Iwai <tiwai@xxxxxxxx>
Cc: Takashi Iwai <tiwai@xxxxxxx>
Cc: Xiubo Li <xiubli@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/ceph/libceph.h | 12 ++++++------
net/ceph/ceph_common.c | 18 ++++++------------
net/ceph/osd_client.c | 3 +--
3 files changed, 13 insertions(+), 20 deletions(-)
--- a/include/linux/ceph/libceph.h~libceph-convert-timeouts-to-secs_to_jiffies
+++ a/include/linux/ceph/libceph.h
@@ -72,15 +72,15 @@ struct ceph_options {
/*
* defaults
*/
-#define CEPH_MOUNT_TIMEOUT_DEFAULT msecs_to_jiffies(60 * 1000)
-#define CEPH_OSD_KEEPALIVE_DEFAULT msecs_to_jiffies(5 * 1000)
-#define CEPH_OSD_IDLE_TTL_DEFAULT msecs_to_jiffies(60 * 1000)
+#define CEPH_MOUNT_TIMEOUT_DEFAULT secs_to_jiffies(60)
+#define CEPH_OSD_KEEPALIVE_DEFAULT secs_to_jiffies(5)
+#define CEPH_OSD_IDLE_TTL_DEFAULT secs_to_jiffies(60)
#define CEPH_OSD_REQUEST_TIMEOUT_DEFAULT 0 /* no timeout */
#define CEPH_READ_FROM_REPLICA_DEFAULT 0 /* read from primary */
-#define CEPH_MONC_HUNT_INTERVAL msecs_to_jiffies(3 * 1000)
-#define CEPH_MONC_PING_INTERVAL msecs_to_jiffies(10 * 1000)
-#define CEPH_MONC_PING_TIMEOUT msecs_to_jiffies(30 * 1000)
+#define CEPH_MONC_HUNT_INTERVAL secs_to_jiffies(3)
+#define CEPH_MONC_PING_INTERVAL secs_to_jiffies(10)
+#define CEPH_MONC_PING_TIMEOUT secs_to_jiffies(30)
#define CEPH_MONC_HUNT_BACKOFF 2
#define CEPH_MONC_HUNT_MAX_MULT 10
--- a/net/ceph/ceph_common.c~libceph-convert-timeouts-to-secs_to_jiffies
+++ a/net/ceph/ceph_common.c
@@ -527,29 +527,23 @@ int ceph_parse_param(struct fs_parameter
case Opt_osdkeepalivetimeout:
/* 0 isn't well defined right now, reject it */
- if (result.uint_32 < 1 || result.uint_32 > INT_MAX / 1000)
+ if (result.uint_32 < 1)
goto out_of_range;
- opt->osd_keepalive_timeout =
- msecs_to_jiffies(result.uint_32 * 1000);
+ opt->osd_keepalive_timeout = secs_to_jiffies(result.uint_32);
break;
case Opt_osd_idle_ttl:
/* 0 isn't well defined right now, reject it */
- if (result.uint_32 < 1 || result.uint_32 > INT_MAX / 1000)
+ if (result.uint_32 < 1)
goto out_of_range;
- opt->osd_idle_ttl = msecs_to_jiffies(result.uint_32 * 1000);
+ opt->osd_idle_ttl = secs_to_jiffies(result.uint_32);
break;
case Opt_mount_timeout:
/* 0 is "wait forever" (i.e. infinite timeout) */
- if (result.uint_32 > INT_MAX / 1000)
- goto out_of_range;
- opt->mount_timeout = msecs_to_jiffies(result.uint_32 * 1000);
+ opt->mount_timeout = secs_to_jiffies(result.uint_32);
break;
case Opt_osd_request_timeout:
/* 0 is "wait forever" (i.e. infinite timeout) */
- if (result.uint_32 > INT_MAX / 1000)
- goto out_of_range;
- opt->osd_request_timeout =
- msecs_to_jiffies(result.uint_32 * 1000);
+ opt->osd_request_timeout = secs_to_jiffies(result.uint_32);
break;
case Opt_share:
--- a/net/ceph/osd_client.c~libceph-convert-timeouts-to-secs_to_jiffies
+++ a/net/ceph/osd_client.c
@@ -4989,8 +4989,7 @@ int ceph_osdc_notify(struct ceph_osd_cli
linger_submit(lreq);
ret = linger_reg_commit_wait(lreq);
if (!ret)
- ret = linger_notify_finish_wait(lreq,
- msecs_to_jiffies(2 * timeout * MSEC_PER_SEC));
+ ret = linger_notify_finish_wait(lreq, secs_to_jiffies(2 * timeout));
else
dout("lreq %p failed to initiate notify %d\n", lreq, ret);
_
Patches currently in -mm which might be from eahariha@xxxxxxxxxxxxxxxxxxx are
