Re: [PATCH 09/16] xfs: convert timeouts to secs_to_jiffies()

Darrick J. Wong
2025-01-29T06:24:46Z

On Tue, Jan 28, 2025 at 06:21:54PM +0000, Easwar Hariharan wrote:
> 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
> +secs_to_jiffies
> (E
> - * \( 1000 \| MSEC_PER_SEC \)
> )
>
> Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com>

Looks good to me,
Acked-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> ---
> fs/xfs/xfs_icache.c | 2 +-
> fs/xfs/xfs_sysfs.c | 7 +++----
> 2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
> index 7b6c026d01a1fc020a41a678964cdbf7a8113323..7a1feb8dc21f6f71d04f88de866e5a95925e0c54 100644
> --- a/fs/xfs/xfs_icache.c
> +++ b/fs/xfs/xfs_icache.c
> @@ -230,7 +230,7 @@ xfs_blockgc_queue(
> rcu_read_lock();
> if (radix_tree_tagged(&pag->pag_ici_root, XFS_ICI_BLOCKGC_TAG))
> queue_delayed_work(mp->m_blockgc_wq, &pag->pag_blockgc_work,
> - msecs_to_jiffies(xfs_blockgc_secs * 1000));
> + secs_to_jiffies(xfs_blockgc_secs));
> rcu_read_unlock();
> }
>
> diff --git a/fs/xfs/xfs_sysfs.c b/fs/xfs/xfs_sysfs.c
> index 60cb5318fdae3cc246236fd988b4749df57f8bfc..eed0f28afe97ead762a9539e45f292db7d0d0c4a 100644
> --- a/fs/xfs/xfs_sysfs.c
> +++ b/fs/xfs/xfs_sysfs.c
> @@ -568,8 +568,8 @@ retry_timeout_seconds_store(
> if (val == -1)
> cfg->retry_timeout = XFS_ERR_RETRY_FOREVER;
> else {
> - cfg->retry_timeout = msecs_to_jiffies(val * MSEC_PER_SEC);
> - ASSERT(msecs_to_jiffies(val * MSEC_PER_SEC) < LONG_MAX);
> + cfg->retry_timeout = secs_to_jiffies(val);
> + ASSERT(secs_to_jiffies(val) < LONG_MAX);
> }
> return count;
> }
> @@ -686,8 +686,7 @@ xfs_error_sysfs_init_class(
> if (init[i].retry_timeout == XFS_ERR_RETRY_FOREVER)
> cfg->retry_timeout = XFS_ERR_RETRY_FOREVER;
> else
> - cfg->retry_timeout = msecs_to_jiffies(
> - init[i].retry_timeout * MSEC_PER_SEC);
> + cfg->retry_timeout = secs_to_jiffies(init[i].retry_timeout);
> }
> return 0;
>
>
> --
> 2.43.0
>
>