From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Sep 2025 22:24:58 +0000 (-0700)
Subject: Merge tag 'dlm-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
X-Git-Tag: v6.18-rc1~222
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a769648f464c9f453b3dc5c2bb8559b28c5d78a1;p=thirdparty%2Flinux.git

Merge tag 'dlm-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

Pull dlm updates from David Teigland:
 "This adds a dlm_release_lockspace() flag to request that node-failure
  recovery be performed for the node leaving the lockspace.

  The implementation of this flag requires coordination with userland
  clustering components. It's been requested for use by GFS2"

* tag 'dlm-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: check for undefined release_option values
  dlm: handle release_option as unsigned
  dlm: move to rinfo for all middle conversion cases
  dlm: handle invalid lockspace member remove
  dlm: add new flag DLM_RELEASE_RECOVER for dlm_lockspace_release
  dlm: add new configfs entry release_recover for lockspace members
  dlm: add new RELEASE_RECOVER uevent attribute for release_lockspace
  dlm: use defines for force values in dlm_release_lockspace
  dlm: check for defined force value in dlm_lockspace_release
---

a769648f464c9f453b3dc5c2bb8559b28c5d78a1
diff --cc fs/gfs2/lock_dlm.c
index ae058b1f9435d,aac4dd6d0381f..4f00af7dd256b
--- a/fs/gfs2/lock_dlm.c
+++ b/fs/gfs2/lock_dlm.c
@@@ -1454,12 -1436,10 +1454,12 @@@ static void gdlm_unmount(struct gfs2_sb
  
  	/* mounted_lock and control_lock will be purged in dlm recovery */
  release:
 +	down_write(&ls->ls_sem);
  	if (ls->ls_dlm) {
- 		dlm_release_lockspace(ls->ls_dlm, 2);
+ 		dlm_release_lockspace(ls->ls_dlm, DLM_RELEASE_NORMAL);
  		ls->ls_dlm = NULL;
  	}
 +	up_write(&ls->ls_sem);
  
  	free_recover_size(ls);
  }