| Message ID | 1612408323-23579-1-git-send-email-yang.lee@linux.alibaba.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ocfs2: Remove unneeded return variable | expand |
Actually I think the macro of map_flag() is ugly. Yang may want to fix that first. Thanks, Wengang On 2/3/21 9:12 PM, Joseph Qi wrote: > NAK. > This was discussed before, please refer: > https://oss.oracle.com/pipermail/ocfs2-devel/2020-April/014969.html > > Thanks, > Joseph > > On 2/4/21 11:12 AM, Yang Li wrote: >> This patch removes unneeded return variables, using only >> '0' instead. >> It fixes the following warning detected by coccinelle: >> ./fs/ocfs2/stack_o2cb.c:69:5-16: Unneeded variable: "o2dlm_flags". >> Return "0" on line 84 >> >> Reported-by: Abaci Robot <abaci@linux.alibaba.com> >> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> >> --- >> fs/ocfs2/stack_o2cb.c | 4 +--- >> 1 file changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/fs/ocfs2/stack_o2cb.c b/fs/ocfs2/stack_o2cb.c >> index dbf8b57..2da9633 100644 >> --- a/fs/ocfs2/stack_o2cb.c >> +++ b/fs/ocfs2/stack_o2cb.c >> @@ -66,8 +66,6 @@ static inline int mode_to_o2dlm(int mode) >> } >> static int flags_to_o2dlm(u32 flags) >> { >> - int o2dlm_flags = 0; >> - >> map_flag(DLM_LKF_NOQUEUE, LKM_NOQUEUE); >> map_flag(DLM_LKF_CANCEL, LKM_CANCEL); >> map_flag(DLM_LKF_CONVERT, LKM_CONVERT); >> @@ -81,7 +79,7 @@ static int flags_to_o2dlm(u32 flags) >> /* map_flag() should have cleared every flag passed in */ >> BUG_ON(flags != 0); >> >> - return o2dlm_flags; >> + return 0; >> } >> #undef map_flag >> >> > _______________________________________________ > Ocfs2-devel mailing list > Ocfs2-devel@oss.oracle.com > https://oss.oracle.com/mailman/listinfo/ocfs2-devel
diff --git a/fs/ocfs2/stack_o2cb.c b/fs/ocfs2/stack_o2cb.c index dbf8b57..2da9633 100644 --- a/fs/ocfs2/stack_o2cb.c +++ b/fs/ocfs2/stack_o2cb.c @@ -66,8 +66,6 @@ static inline int mode_to_o2dlm(int mode) } static int flags_to_o2dlm(u32 flags) { - int o2dlm_flags = 0; - map_flag(DLM_LKF_NOQUEUE, LKM_NOQUEUE); map_flag(DLM_LKF_CANCEL, LKM_CANCEL); map_flag(DLM_LKF_CONVERT, LKM_CONVERT); @@ -81,7 +79,7 @@ static int flags_to_o2dlm(u32 flags) /* map_flag() should have cleared every flag passed in */ BUG_ON(flags != 0); - return o2dlm_flags; + return 0; } #undef map_flag
This patch removes unneeded return variables, using only '0' instead. It fixes the following warning detected by coccinelle: ./fs/ocfs2/stack_o2cb.c:69:5-16: Unneeded variable: "o2dlm_flags". Return "0" on line 84 Reported-by: Abaci Robot <abaci@linux.alibaba.com> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> --- fs/ocfs2/stack_o2cb.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)