This is an automated email from the git hooks/post-receive script.
teigland pushed a commit to branch master in repository sanlock.
The following commit(s) were added to refs/heads/master by this push: new 63a4877 sanlock: fix previous change to delta_read_lockspace_sizes 63a4877 is described below
commit 63a48773eb8f338189e39b98aee1bb72e23c68fb Author: David Teigland teigland@redhat.com AuthorDate: Fri Jul 18 14:37:28 2025 -0500
sanlock: fix previous change to delta_read_lockspace_sizes
commit ca76b929ffea1f2f3b6c41a2ef8af782abe6ee6f "sanlock: make delta_read_lockspace_sizes compare host_id"
broke the common case in which the delta lease is newly created and has owner_id 0. --- src/delta_lease.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/delta_lease.c b/src/delta_lease.c index 82b2ef8..e9dd4c1 100644 --- a/src/delta_lease.c +++ b/src/delta_lease.c @@ -236,7 +236,7 @@ int delta_read_lockspace_sizes(struct task *task, if ((leader.version & 0xFFFF0000) != DELTA_DISK_VERSION_MAJOR) goto next;
- if (leader.owner_id != host_id) + if (leader.owner_id && (leader.owner_id != host_id)) goto next;
if (leader.sector_size != 512) @@ -264,7 +264,7 @@ int delta_read_lockspace_sizes(struct task *task, if ((leader.version & 0xFFFF0000) != DELTA_DISK_VERSION_MAJOR) return SANLK_LEADER_VERSION;
- if (leader.owner_id != host_id) + if (leader.owner_id && (leader.owner_id != host_id)) return SANLK_LEADER_DIFF;
if (leader.sector_size != 4096)
sanlock-devel@lists.fedorahosted.org