Re: [Ocfs2-devel] [PATCH] ocfs2/dlm: clean up deadcode in dlm_master_request_handler()

[Joseph Qi]

On 2016/10/31 21:52, piaojun wrote:
> when 'dispatch_assert' is set, 'response' must be DLM_MASTER_RESP_YES,
> and 'res' won't be null, so execution can't reach these two branch.
> 
> Signed-off-by: Jun Piao 

Looks good to me.
Reviewed-by: Joseph Qi 
> ---
>  fs/ocfs2/dlm/dlmmaster.c | 6 --
>  1 file changed, 6 deletions(-)
> 
> diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
> index 3f828a1..9a72dd8 100644
> --- a/fs/ocfs2/dlm/dlmmaster.c
> +++ b/fs/ocfs2/dlm/dlmmaster.c
> @@ -1644,12 +1644,6 @@ int dlm_master_request_handler(struct o2net_msg *msg, 
> u32 len, void *data,
>* dlm_assert_master_worker() isn't called, we drop it here.
>*/
>   if (dispatch_assert) {
> - if (response != DLM_MASTER_RESP_YES)
> - mlog(ML_ERROR, "invalid response %d\n", response);
> - if (!res) {
> - mlog(ML_ERROR, "bad lockres while trying to assert!\n");
> - BUG();
> - }
>   mlog(0, "%u is the owner of %.*s, cleaning everyone else\n",
>dlm->node_num, res->lockname.len, 
> res->lockname.name);
>   spin_lock(&res->spinlock);
> 



___
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel

[Ocfs2-devel] [PATCH] ocfs2/dlm: clean up deadcode in dlm_master_request_handler()

[piaojun]

when 'dispatch_assert' is set, 'response' must be DLM_MASTER_RESP_YES,
and 'res' won't be null, so execution can't reach these two branch.

Signed-off-by: Jun Piao 
---
 fs/ocfs2/dlm/dlmmaster.c | 6 --
 1 file changed, 6 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 3f828a1..9a72dd8 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -1644,12 +1644,6 @@ int dlm_master_request_handler(struct o2net_msg *msg, 
u32 len, void *data,
 * dlm_assert_master_worker() isn't called, we drop it here.
 */
if (dispatch_assert) {
-   if (response != DLM_MASTER_RESP_YES)
-   mlog(ML_ERROR, "invalid response %d\n", response);
-   if (!res) {
-   mlog(ML_ERROR, "bad lockres while trying to assert!\n");
-   BUG();
-   }
mlog(0, "%u is the owner of %.*s, cleaning everyone else\n",
 dlm->node_num, res->lockname.len, 
res->lockname.name);
spin_lock(&res->spinlock);
-- 
1.9.5.msysgit.1


___
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel