jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 05:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Linux 6.3: Include linux/filelock.h if available

Browse Source 
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 <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
(cherry picked from commit 6873dc925c5acc0ce7d65cf778ffee09c82a9898)

Change-Id: If131bee5b466a119f54b05388a065e6af23698cf
Reviewed-on: https://gerrit.openafs.org/15388
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Kailas Zadbuke <kailashsz@in.ibm.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
This commit is contained in:
Cheyenne Wills 2023-03-22 16:56:09 -06:00 committed by Stephan Wiesand
parent 30cf5d8f93
commit 7a3ad3bc1c
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/afs/LINUX/osi_compat.h
View File

@ -13,6 +13,10 @@
# include <linux/freezer.h>
#endif
#if defined(HAVE_LINUX_FILELOCK_H)
# include <linux/filelock.h>
#endif
#if defined(LINUX_KEYRING_SUPPORT)
# include <linux/rwsem.h>
# include <linux/key.h>

6
src/cf/linux-kernel-func.m4
View File

@ -94,7 +94,11 @@ AC_CHECK_LINUX_FUNC([ktime_get_real_ts64],
[struct timespec64 *s;
ktime_get_real_ts64(s);])
AC_CHECK_LINUX_FUNC([locks_lock_file_wait],
[#include <linux/fs.h>],
[#ifdef HAVE_LINUX_FILELOCK_H
# include <linux/filelock.h>
#else
# include <linux/fs.h>
#endif],
[locks_lock_file_wait(NULL, NULL);])
AC_CHECK_LINUX_FUNC([override_creds],
[#include <linux/cred.h>],

2
src/cf/linux-kernel-header.m4
View File

@ -10,4 +10,6 @@ AC_CHECK_LINUX_HEADER([seq_file.h])
AC_CHECK_LINUX_HEADER([sched/signal.h])
AC_CHECK_LINUX_HEADER([uaccess.h])
AC_CHECK_LINUX_HEADER([stdarg.h])
dnl Linux 6.3 relocated file locking related declarations into it's own header
AC_CHECK_LINUX_HEADER([filelock.h])
])

6
src/cf/linux-test4.m4
View File

@ -142,7 +142,11 @@ AC_DEFUN([LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_SIGNAL_RLIM], [
AC_DEFUN([LINUX_KERNEL_POSIX_LOCK_FILE_WAIT_ARG], [
AC_CHECK_LINUX_BUILD([for 3rd argument in posix_lock_file found in new kernels],
[ac_cv_linux_kernel_posix_lock_file_wait_arg],
[#include <linux/fs.h>],
[#ifdef HAVE_LINUX_FILELOCK_H
# include <linux/filelock.h>
#else
# include <linux/fs.h>
#endif],
[posix_lock_file(0,0,0);],
[POSIX_LOCK_FILE_WAIT_ARG],
[define if your kernel uses 3 arguments for posix_lock_file],