Skip to contentSkip to conversation

dlm fixes for 6.9

GIT PULL Merged David Teigland 3 participants 3 messages Mar 18, 2024

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull dlm fixes from tag:

git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm-6.9

(For v2 I recreated the tag with the same name as before, but now realize I probably should have left it and used a new tag name.)

I dropped the commit with the bad atomic usage, and replaced it with two other commits: the first reverts the unnecessary change that began using atomic_t for lkb_wait_count, and the second adds comments to the recovery code that forcibly resets the wait_count state.

Thanks,
Dave

Alexander Aring (1):
dlm: fix user space lkb refcounting

David Teigland (2):
dlm: revert atomic_t lkb_wait_count
dlm: add comments about forced waiters reset

 fs/dlm/dlm_internal.h |   2 +-
 fs/dlm/lock.c         | 114 ++++++++++++++++++++++++++++++++++----------------
 fs/dlm/user.c         |  10 ++---
 3 files changed, 84 insertions(+), 42 deletions(-)
#1 lore raw
Quoted 5 lines · David Teigland

I dropped the commit with the bad atomic usage, and replaced it with two other commits: the first reverts the unnecessary change that began using atomic_t for lkb_wait_count, and the second adds comments to the recovery code that forcibly resets the wait_count state.

Ok, the diff certainly looks saner. I didn't look at the code outside the context of the diff, so that's literally just going by the patches themselves, but I appreciate the comment ("The wait_count will almost always be 1, but in case of an overlapping unlock/cancel it could be 2: see ..") and yes, it just makes the old atomic thing sound even odder.

Thanks,

Linus

merge bot Merged
#2 lore raw
In reply to David Teigland
The pull request you sent on Mon, 18 Mar 2024 16:25:07 -0500:

The pull request you sent on Mon, 18 Mar 2024 16:25:07 -0500:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm-6.9

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b3603fcb79b1036acae10602bffc4855a4b9af80

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html