diff options
| author | Alexander Aring <aahringo@redhat.com> | 2023-08-01 14:09:45 -0400 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2023-08-10 10:33:03 -0500 |
| commit | c4f4e135c27b503d325d414819831909023b113d (patch) | |
| tree | c8058943ff789979369e139c56c84ce7534b4b75 /fs/dlm/member.c | |
| parent | 643f5cfa610f475c7465e4158b2b1fdd170fac10 (diff) | |
| download | linux-c4f4e135c27b503d325d414819831909023b113d.tar.gz | |
fs: dlm: get recovery sequence number as parameter
This patch removes a read of the ls->ls_recover_seq uint64_t number in
_create_rcom(). If the ls->ls_recover_seq is readed the ls_recover_lock
need to held. However this number was always readed before when any rcom
message is received and it's not necessary to read it again from a per
lockspace variable to use it for the replying message. This patch will
pass the sequence number as parameter so another read of ls->ls_recover_seq
and holding the ls->ls_recover_lock is not required.
Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/member.c')
| -rw-r--r-- | fs/dlm/member.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/dlm/member.c b/fs/dlm/member.c index f303ea8bd256e..19f3cd96f3c0d 100644 --- a/fs/dlm/member.c +++ b/fs/dlm/member.c @@ -449,7 +449,7 @@ static void make_member_array(struct dlm_ls *ls) /* send a status request to all members just to establish comms connections */ -static int ping_members(struct dlm_ls *ls) +static int ping_members(struct dlm_ls *ls, uint64_t seq) { struct dlm_member *memb; int error = 0; @@ -459,7 +459,7 @@ static int ping_members(struct dlm_ls *ls) error = -EINTR; break; } - error = dlm_rcom_status(ls, memb->nodeid, 0); + error = dlm_rcom_status(ls, memb->nodeid, 0, seq); if (error) break; } @@ -607,7 +607,7 @@ int dlm_recover_members(struct dlm_ls *ls, struct dlm_recover *rv, int *neg_out) make_member_array(ls); *neg_out = neg; - error = ping_members(ls); + error = ping_members(ls, rv->seq); log_rinfo(ls, "dlm_recover_members %d nodes", ls->ls_num_nodes); return error; } |