Re: [PATCH] OCFS2: remove useless err

From: Joseph Qi
Date: Sat Jan 25 2020 - 20:52:46 EST




On 20/1/21 11:37, Alex Shi wrote:
> We don't need 'err' in these 2 places, better to remove them.
>
> Signed-off-by: Alex Shi <alex.shi@xxxxxxxxxxxxxxxxx>
> Cc: Mark Fasheh <mark@xxxxxxxxxx>
> Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
> Cc: Joseph Qi <joseph.qi@xxxxxxxxxxxxxxxxx>
> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> Cc: Kate Stewart <kstewart@xxxxxxxxxxxxxxxxxxx>
> Cc: ChenGang <cg.chen@xxxxxxxxxx>
> Cc: Richard Fontana <rfontana@xxxxxxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: ocfs2-devel@xxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> ---
> fs/ocfs2/cluster/tcp.c | 3 +--
> fs/ocfs2/dir.c | 4 ++--
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
> index 48a3398f0bf5..9261c1f06a9f 100644
> --- a/fs/ocfs2/cluster/tcp.c
> +++ b/fs/ocfs2/cluster/tcp.c
> @@ -1948,7 +1948,6 @@ static void o2net_accept_many(struct work_struct *work)
> {
> struct socket *sock = o2net_listen_sock;
> int more;
> - int err;
>
> /*
> * It is critical to note that due to interrupt moderation
> @@ -1963,7 +1962,7 @@ static void o2net_accept_many(struct work_struct *work)
> */
>
> for (;;) {
> - err = o2net_accept_one(sock, &more);
> + o2net_accept_one(sock, &more);
> if (!more)
> break;
> cond_resched();
> diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
> index bdef72c0f099..5761060d2ba8 100644
> --- a/fs/ocfs2/dir.c
> +++ b/fs/ocfs2/dir.c
> @@ -676,7 +676,7 @@ static struct buffer_head *ocfs2_find_entry_el(const char *name, int namelen,
> int ra_ptr = 0; /* Current index into readahead
> buffer */
> int num = 0;
> - int nblocks, i, err;
> + int nblocks, i;
>
> sb = dir->i_sb;
>
> @@ -708,7 +708,7 @@ static struct buffer_head *ocfs2_find_entry_el(const char *name, int namelen,
> num++;
>
> bh = NULL;
> - err = ocfs2_read_dir_block(dir, b++, &bh,
> + ocfs2_read_dir_block(dir, b++, &bh,
> OCFS2_BH_READAHEAD);

Umm... missing error checking here?

Thanks,
Joseph
> bh_use[ra_max] = bh;
> }
>