The following commit has been merged in the openafs-stable-1_8_x branch: commit 7a3ad3bc1c87e525698f7dda1e4b0fbbd913da03 Author: Cheyenne Wills <cwi...@sinenomine.net> Date: Wed Mar 22 16:56:09 2023 -0600
Linux 6.3: Include linux/filelock.h if available Linux 6.3 commit 'filelock: move file locking definitions to separate header file' (5970e15dbc) relocated file lock related declarations from 'linux/fs.h' into its own header file, 'linux/filelock.h'. Add autoconf tests to check for the header file 'linux/filelock.h' and update function checks for locks_lock_file_wait() and posix_lock_file(). Update osi_compat.h to include linux/filelock.h if it is available. Reviewed-on: https://gerrit.openafs.org/15346 Tested-by: BuildBot <build...@rampaginggeek.com> Reviewed-by: Benjamin Kaduk <ka...@mit.edu> Reviewed-by: Andrew Deason <adea...@sinenomine.net> (cherry picked from commit 6873dc925c5acc0ce7d65cf778ffee09c82a9898) Change-Id: If131bee5b466a119f54b05388a065e6af23698cf Reviewed-on: https://gerrit.openafs.org/15388 Tested-by: BuildBot <build...@rampaginggeek.com> Reviewed-by: Andrew Deason <adea...@sinenomine.net> Reviewed-by: Michael Meffie <mmef...@sinenomine.net> Reviewed-by: Kailas Zadbuke <kailas...@in.ibm.com> Reviewed-by: Stephan Wiesand <stephan.wies...@desy.de> src/afs/LINUX/osi_compat.h | 4 ++++ src/cf/linux-kernel-func.m4 | 6 +++++- src/cf/linux-kernel-header.m4 | 2 ++ src/cf/linux-test4.m4 | 6 +++++- 4 files changed, 16 insertions(+), 2 deletions(-) -- OpenAFS Master Repository _______________________________________________ OpenAFS-cvs mailing list OpenAFS-cvs@openafs.org https://lists.openafs.org/mailman/listinfo/openafs-cvs