Received-SPF: pass (google.com: domain of linux-kernel+bounces-106693-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Mon, 18 Mar 2024 16:25:07 -0500
From: David Teigland <teigland@redhat.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, gfs2@lists.linux.dev
Subject: [GIT PULL v2] dlm fixes for 6.9
Message-ID: <ZfixMxRWFNmkf-Ta@redhat.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

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(-)