From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Aring Date: Wed, 15 Sep 2021 16:39:15 -0400 Subject: [Cluster-devel] [PATCH dlm/next 2/3] fs: dlm: call dlm_lsop_recover_prep once In-Reply-To: <20210915203916.3661690-1-aahringo@redhat.com> References: <20210915203916.3661690-1-aahringo@redhat.com> Message-ID: <20210915203916.3661690-3-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 changes the behaviour of "dlm_lsop_recover_prep" callback. It will be called once when locking was stopped if it was previously running not if dlm_ls_stop() is called multiple times when locking was already stopped. Now it will be called only if a dlm_ls_start() was before. Signed-off-by: Alexander Aring --- fs/dlm/member.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/fs/dlm/member.c b/fs/dlm/member.c index 5f5b07bdbcc3..446e1635229d 100644 --- a/fs/dlm/member.c +++ b/fs/dlm/member.c @@ -685,7 +685,16 @@ int dlm_ls_stop(struct dlm_ls *ls) if (!ls->ls_recover_begin) ls->ls_recover_begin = jiffies; - dlm_lsop_recover_prep(ls); + /* call recover_prep ops only once and not multiple times + * for each possible dlm_ls_stop() when recovery is already + * stopped. + * + * If we successful was able to clear LSFL_RUNNING bit and + * it was set we know it is the first dlm_ls_stop() call. + */ + if (new) + dlm_lsop_recover_prep(ls); + return 0; } -- 2.27.0