]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
Merge tag 'dlm-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jan 2024 18:17:23 +0000 (10:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jan 2024 18:17:23 +0000 (10:17 -0800)
commitd8c8e595dc31fb639bc4f8a202901afaa15bb13f
tree0d9bd29e999151aa885b1e76d8d958ca642c137e
parent0c59ae1290741854b6cf597ef05bfa9bc811389f
parent5beebc1dda47719dac85830c53bca1a0ab497d96
Merge tag 'dlm-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

Pull dlm updates from David Teigland:
 "This set cleans up the interface between nfs lockd and dlm, which is
  handling nfs file locking for gfs2 and ocfs2. Very basic lockd
  functionality is fixed, in which the fl owner was using the lockd pid
  instead of the owner value from nfs"

* tag 'dlm-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: update format header reflect current format
  dlm: fix format seq ops type 4
  dlm: implement EXPORT_OP_ASYNC_LOCK
  dlm: use FL_SLEEP to determine blocking vs non-blocking
  dlm: use fl_owner from lockd
  dlm: use kernel_connect() and kernel_bind()
fs/gfs2/export.c