From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Aring Date: Wed, 23 Feb 2022 12:08:28 -0500 Subject: [Cluster-devel] [PATCH/RFC dlm/next 8/9] fs: dlm: remove found label in dlm_master_lookup In-Reply-To: <20220223170829.830864-1-aahringo@redhat.com> References: <20220223170829.830864-1-aahringo@redhat.com> Message-ID: <20220223170829.830864-9-aahringo@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit This patch cleanups a not necessary label found which can be replaced by a proper else handling to jump over a specific code block. Signed-off-by: Alexander Aring --- fs/dlm/lock.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index 43f362f159ef..013d46cc58e0 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -954,18 +954,18 @@ int dlm_master_lookup(struct dlm_ls *ls, int from_nodeid, char *name, int len, hold_rsb(r); spin_unlock(&ls->ls_rsbtbl[b].lock); lock_rsb(r); - goto found; - } + } else { + error = dlm_search_rsb_tree(&ls->ls_rsbtbl[b].toss, name, len, &r); + if (error) + goto not_found; - error = dlm_search_rsb_tree(&ls->ls_rsbtbl[b].toss, name, len, &r); - if (error) - goto not_found; + /* because the rsb is inactive (on toss list), it's not refcounted + * and lock_rsb is not used, but is protected by the rsbtbl lock + */ - /* because the rsb is inactive (on toss list), it's not refcounted - and lock_rsb is not used, but is protected by the rsbtbl lock */ + toss_list = 1; + } - toss_list = 1; - found: if (r->res_dir_nodeid != our_nodeid) { /* should not happen, but may as well fix it and carry on */ log_error(ls, "dlm_master_lookup res_dir %d our %d %s", -- 2.31.1