2020-01-21 03:38:29

by Alex Shi

Subject: [PATCH] OCFS2: remove useless err

We don't need 'err' in these 2 places, better to remove them.

Signed-off-by: Alex Shi <[email protected]>
Cc: Mark Fasheh <[email protected]>
Cc: Joel Becker <[email protected]>
Cc: Joseph Qi <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Kate Stewart <[email protected]>
Cc: ChenGang <[email protected]>
Cc: Richard Fontana <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
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);
bh_use[ra_max] = bh;
}
--
1.8.3.1

2020-01-26 01:54:16

by Joseph Qi

Subject: Re: [PATCH] OCFS2: remove useless err

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 <[email protected]>
> Cc: Mark Fasheh <[email protected]>
> Cc: Joel Becker <[email protected]>
> Cc: Joseph Qi <[email protected]>
> Cc: Andrew Morton <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: Kate Stewart <[email protected]>
> Cc: ChenGang <[email protected]>
> Cc: Richard Fontana <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> ---
> 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;
> }
>

2020-02-04 11:00:39

by Alex Shi

Subject: Re: [PATCH] OCFS2: remove useless err

在 2020/1/26 上午9:52, Joseph Qi 写道:
>

>>
>> @@ -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?


/*
* This function forces all errors to -EIO for consistency with its
* predecessor, ocfs2_bread(). We haven't audited what returning the
* real error codes would do to callers. We log the real codes with
* mlog_errno() before we squash them.
*/
static int ocfs2_read_dir_block(struct inode *inode, u64 v_block,
struct buffer_head **bh, int flags)

According to ocfs2_read_dir_block comments, caller don't care the err value, func will log it.

So is this patch ok? :)

Thanks
Alex

2020-02-04 11:35:51

by Joseph Qi

Subject: Re: [PATCH] OCFS2: remove useless err

On 20/2/4 18:59, Alex Shi wrote:
>
>
> 在 2020/1/26 上午9:52, Joseph Qi 写道:
>>
>
>>>
>>> @@ -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?
>
>
> /*
> * This function forces all errors to -EIO for consistency with its
> * predecessor, ocfs2_bread(). We haven't audited what returning the
> * real error codes would do to callers. We log the real codes with
> * mlog_errno() before we squash them.
> */
> static int ocfs2_read_dir_block(struct inode *inode, u64 v_block,
> struct buffer_head **bh, int flags)
>
> According to ocfs2_read_dir_block comments, caller don't care the err value, func will log it.
>
> So is this patch ok? :)
>
If we got error here, it means the buffer head is invalid.
So how about mark it as NULL and skip it?

Thanks,
Joseph

2020-02-05 08:42:13

by Joseph Qi

Subject: Re: [Ocfs2-devel] [PATCH] OCFS2: remove useless err

On 20/2/4 19:34, Joseph Qi wrote:
>
>
> On 20/2/4 18:59, Alex Shi wrote:
>>
>>
>> 在 2020/1/26 上午9:52, Joseph Qi 写道:
>>>
>>
>>>>
>>>> @@ -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?
>>
>>
>> /*
>> * This function forces all errors to -EIO for consistency with its
>> * predecessor, ocfs2_bread(). We haven't audited what returning the
>> * real error codes would do to callers. We log the real codes with
>> * mlog_errno() before we squash them.
>> */
>> static int ocfs2_read_dir_block(struct inode *inode, u64 v_block,
>> struct buffer_head **bh, int flags)
>>
>> According to ocfs2_read_dir_block comments, caller don't care the err value, func will log it.
>>
>> So is this patch ok? :)
>>
> If we got error here, it means the buffer head is invalid.
> So how about mark it as NULL and skip it?
>

Okay, in this case, bh is already NULL and will skip below,
so it looks fine to me.

2020-02-05 08:44:17

by Joseph Qi

Subject: Re: [PATCH] OCFS2: remove useless err

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 <[email protected]>
> Cc: Mark Fasheh <[email protected]>
> Cc: Joel Becker <[email protected]>
> Cc: Joseph Qi <[email protected]>
> Cc: Andrew Morton <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: Kate Stewart <[email protected]>
> Cc: ChenGang <[email protected]>
> Cc: Richard Fontana <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: [email protected]
> Cc: [email protected]

Reviewed-by: Joseph Qi <[email protected]>
> ---
> 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);
> bh_use[ra_max] = bh;
> }
>