* [PATCH] ocfs2: remove deadcode on variable tmp_oh check
@ 2019-08-30 11:16 Colin King
2019-09-02 2:06 ` Joseph Qi
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2019-08-30 11:16 UTC (permalink / raw)
To: Mark Fasheh, Joel Becker, Joseph Qi, ocfs2-devel
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
At the end of cfs2_inode_lock_tracker tmp_oh is true because an
earlier check on tmp_oh being false returns out of the function.
Since tmp_oh is true, the function will always return 1 so remove
the redundant check and return of 0.
Addresses-Coverity: ("Logically dead code")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
fs/ocfs2/dlmglue.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
index ad594fef2ab0..ff0cf851c9e6 100644
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
@@ -2712,7 +2712,7 @@ int ocfs2_inode_lock_tracker(struct inode *inode,
return status;
}
}
- return tmp_oh ? 1 : 0;
+ return 1;
}
void ocfs2_inode_unlock_tracker(struct inode *inode,
--
2.20.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] ocfs2: remove deadcode on variable tmp_oh check
2019-08-30 11:16 [PATCH] ocfs2: remove deadcode on variable tmp_oh check Colin King
@ 2019-09-02 2:06 ` Joseph Qi
0 siblings, 0 replies; 2+ messages in thread
From: Joseph Qi @ 2019-09-02 2:06 UTC (permalink / raw)
To: Colin King, Mark Fasheh, Joel Becker, ocfs2-devel, Andrew Morton
Cc: kernel-janitors, linux-kernel
On 19/8/30 19:16, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> At the end of cfs2_inode_lock_tracker tmp_oh is true because an
s/cfs2_inode_lock_tracker/ocfs2_inode_lock_tracker/
BTW, could you please correct the following description of this
function as well?
"return == -1 if this lock attempt will cause an upgrade which is forbidden."
In fact, it returns -EINVAL.
Thanks,
Joseph
> earlier check on tmp_oh being false returns out of the function.
> Since tmp_oh is true, the function will always return 1 so remove
> the redundant check and return of 0.
>
> Addresses-Coverity: ("Logically dead code")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> fs/ocfs2/dlmglue.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
> index ad594fef2ab0..ff0cf851c9e6 100644
> --- a/fs/ocfs2/dlmglue.c
> +++ b/fs/ocfs2/dlmglue.c
> @@ -2712,7 +2712,7 @@ int ocfs2_inode_lock_tracker(struct inode *inode,
> return status;
> }
> }
> - return tmp_oh ? 1 : 0;
> + return 1;
> }
>
> void ocfs2_inode_unlock_tracker(struct inode *inode,
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-09-02 2:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-30 11:16 [PATCH] ocfs2: remove deadcode on variable tmp_oh check Colin King
2019-09-02 2:06 ` Joseph Qi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®