[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAGiJo8QV_Y6JO8xdYp6AEhavHp+_VvLJ02gU=fwUC5b_5NhcbA@mail.gmail.com>
Date: Fri, 15 Nov 2024 00:01:33 -0800
From: Daniel Yang <danielyangkang@...il.com>
To: Joseph Qi <joseph.qi@...ux.alibaba.com>
Cc: Mark Fasheh <mark@...heh.com>, Joel Becker <jlbec@...lplan.org>,
"open list:ORACLE CLUSTER FILESYSTEM 2 (OCFS2)" <ocfs2-devel@...ts.linux.dev>, open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] ocfs2: replace deprecated simple_strtol with kstrtol
On Thu, Nov 14, 2024 at 5:05 PM Joseph Qi <joseph.qi@...ux.alibaba.com> wrote:
>
>
>
> On 11/13/24 4:09 PM, Daniel Yang wrote:
> > The function simple_strtol ignores overflows and has an awkward
> > interface for error checking. Replace with the recommended kstrtol
> > function leads to clearer error checking and safer conversions.
> >
> > Signed-off-by: Daniel Yang <danielyangkang@...il.com>
> > ---
> > fs/ocfs2/cluster/heartbeat.c | 5 +++--
> > 1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
> > index 4b9f45d70..dff18efbc 100644
> > --- a/fs/ocfs2/cluster/heartbeat.c
> > +++ b/fs/ocfs2/cluster/heartbeat.c
> > @@ -3,6 +3,7 @@
> > * Copyright (C) 2004, 2005 Oracle. All rights reserved.
> > */
> >
> > +#include "linux/kstrtox.h"
> > #include <linux/kernel.h>
> > #include <linux/sched.h>
> > #include <linux/jiffies.h>
> > @@ -1777,8 +1778,9 @@ static ssize_t o2hb_region_dev_store(struct config_item *item,
> > if (o2nm_this_node() == O2NM_MAX_NODES)
> > goto out;
> >
> > - fd = simple_strtol(p, &p, 0);
> > - if (!p || (*p && (*p != '\n')))
> > + int p_to_long_ret = kstrtol(p, 0, &fd);
> > +
>
> Please define at the beginning.
> Seems we can just re-use 'ret'.
> BTW, the blank line can be eleminated.
>
> Thanks,
> Joseph
>
> > + if (p_to_long_ret < 0)
> > goto out;
> >
> > if (fd < 0 || fd >= INT_MAX)
>
Ok. Made the changes and sent PATCH v2. Lmk if there's anything else
that needs to be changed.
- Daniel
Powered by blists - more mailing lists