leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fs: dlm: use dlm_recovery_stopped in condition

Browse Source 
This patch will change to evaluate the dlm_recovery_stopped() in the
condition of the if branch instead fetch it before evaluating the
condition. As this is an atomic test-set operation it should be
evaluated in the condition itself.

Reported-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
This commit is contained in:
Alexander Aring
2021-11-02 15:17:13 -04:00
committed by David Teigland
parent 3e9736713d
commit e10249b190
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/dlm/dir.c
View File

@@ -84,8 +84,7 @@ int dlm_recover_directory(struct dlm_ls *ls)
for (;;) { for (;;) {
int left; int left;
error = dlm_recovery_stopped(ls); if (dlm_recovery_stopped(ls)) {
if (error) {
error = -EINTR; error = -EINTR;
goto out_free; goto out_free;
} }

3
fs/dlm/member.c
View File

@@ -442,8 +442,7 @@ static int ping_members(struct dlm_ls *ls)
int error = 0; int error = 0;
list_for_each_entry(memb, &ls->ls_nodes, list) { list_for_each_entry(memb, &ls->ls_nodes, list) {
error = dlm_recovery_stopped(ls); if (dlm_recovery_stopped(ls)) {
if (error) {
error = -EINTR; error = -EINTR;
break; break;
} }

3
fs/dlm/recoverd.c
View File

@@ -124,8 +124,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
dlm_recover_waiters_pre(ls); dlm_recover_waiters_pre(ls);
error = dlm_recovery_stopped(ls); if (dlm_recovery_stopped(ls)) {
if (error) {
error = -EINTR; error = -EINTR;
goto fail; goto fail;
} }