jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 15:00:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Linux-6.9: file_lock mbrs moved to file_lock_core

Browse Source 
In the Linux 6.9 commit:
 'filelock: split common fields into struct file_lock_core' (a69ce85ec9)
several fields were relocated into a new structure, file_lock_core,
which was added as a member the file_lock structure.  The names where
changed (fl_x to flc_x).

Add a configure test to determine if the new members (flc_type, flc_pid,
and flc_flags) are available as part of the file_lock_core structure.

Add static inline getter/setter routines to handle accessing the
flc_type or flc_pid members in the file_lock_core structure, or the
fl_type, fl_pid members in the file_lock structure as appropriate. Add
static inline function to clear FL_SLEEP in the flc_flag in the
file_lock_core structure or the fl_flag in the file_lock structure as
appropriate.

Minor surrounding white space cleanup.

Change-Id: Idfc66db34bab4d5c764647fefda1b9eebb7af0b0
Reviewed-on: https://gerrit.openafs.org/15708
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
This commit is contained in:
Cheyenne Wills 2024-04-15 08:22:37 -06:00 committed by Benjamin Kaduk
parent 134d6c1966
commit 9937cce3f3
3 changed files with 95 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/afs/LINUX/osi_vnodeops.c
View File

@ -712,6 +712,61 @@ afs_linux_fsync(struct file *fp, int datasync)
}
/* Handle getting/setting file_lock type */
static inline unsigned char
afs_get_flock_type(struct file_lock *flp)
{
#if defined(HAVE_FILE_LOCK_CORE)
return flp->c.flc_type;
#else
return flp->fl_type;
#endif
}
static inline void
afs_set_flock_type(struct file_lock *flp, unsigned char type)
{
#if defined(HAVE_FILE_LOCK_CORE)
flp->c.flc_type = type;
#else
flp->fl_type = type;
#endif
}
/* Handle getting/setting file_lock pid */
static inline pid_t
afs_get_flock_pid(struct file_lock *flp)
{
#if defined(HAVE_FILE_LOCK_CORE)
return flp->c.flc_pid;
#else
return flp->fl_pid;
#endif
}
static inline void
afs_set_flock_pid(struct file_lock *flp, pid_t pid)
{
#if defined(HAVE_FILE_LOCK_CORE)
flp->c.flc_pid = pid;
#else
flp->fl_pid = pid;
#endif
}
/* Handle clearing file_lock sleep */
static inline void
afs_clear_flock_sleep(struct file_lock *flp)
{
#if defined(HAVE_FILE_LOCK_CORE)
flp->c.flc_flags &= ~FL_SLEEP;
#else
flp->fl_flags &= ~FL_SLEEP;
#endif
}
static int
afs_linux_lock(struct file *fp, int cmd, struct file_lock *flp)
@ -723,8 +778,8 @@ afs_linux_lock(struct file *fp, int cmd, struct file_lock *flp)
/* Convert to a lock format afs_lockctl understands. */
memset(&flock, 0, sizeof(flock));
flock.l_type = flp->fl_type;
flock.l_pid = flp->fl_pid;
flock.l_type = afs_get_flock_type(flp);
flock.l_pid = afs_get_flock_pid(flp);
flock.l_whence = 0;
flock.l_start = flp->fl_start;
if (flp->fl_end == OFFSET_MAX)
@ -746,10 +801,10 @@ afs_linux_lock(struct file *fp, int cmd, struct file_lock *flp)
code = afs_convert_code(afs_lockctl(vcp, &flock, cmd, credp));
AFS_GUNLOCK();
if ((code == 0 || flp->fl_type == F_UNLCK) &&
(cmd == F_SETLK || cmd == F_SETLKW)) {
if ((code == 0 || afs_get_flock_type(flp) == F_UNLCK) &&
(cmd == F_SETLK || cmd == F_SETLKW)) {
code = afs_posix_lock_file(fp, flp);
if (code && flp->fl_type != F_UNLCK) {
if (code && afs_get_flock_type(flp) != F_UNLCK) {
struct AFS_FLOCK flock2;
flock2 = flock;
flock2.l_type = F_UNLCK;
@ -762,17 +817,17 @@ afs_linux_lock(struct file *fp, int cmd, struct file_lock *flp)
* kernel, as lockctl knows nothing about byte range locks
*/
if (code == 0 && cmd == F_GETLK && flock.l_type == F_UNLCK) {
afs_posix_test_lock(fp, flp);
/* If we found a lock in the kernel's structure, return it */
if (flp->fl_type != F_UNLCK) {
crfree(credp);
return 0;
}
afs_posix_test_lock(fp, flp);
/* If we found a lock in the kernel's structure, return it */
if (afs_get_flock_type(flp) != F_UNLCK) {
crfree(credp);
return 0;
}
}
/* Convert flock back to Linux's file_lock */
flp->fl_type = flock.l_type;
flp->fl_pid = flock.l_pid;
afs_set_flock_type(flp, flock.l_type);
afs_set_flock_pid(flp, flock.l_pid);
flp->fl_start = flock.l_start;
if (flock.l_len == 0)
flp->fl_end = OFFSET_MAX; /* Lock to end of file */
@ -792,8 +847,8 @@ afs_linux_flock(struct file *fp, int cmd, struct file_lock *flp) {
struct AFS_FLOCK flock;
/* Convert to a lock format afs_lockctl understands. */
memset(&flock, 0, sizeof(flock));
flock.l_type = flp->fl_type;
flock.l_pid = flp->fl_pid;
flock.l_type = afs_get_flock_type(flp);
flock.l_pid = afs_get_flock_pid(flp);
flock.l_whence = 0;
flock.l_start = 0;
flock.l_len = 0;
@ -812,11 +867,11 @@ afs_linux_flock(struct file *fp, int cmd, struct file_lock *flp) {
code = afs_convert_code(afs_lockctl(vcp, &flock, cmd, credp));
AFS_GUNLOCK();
if ((code == 0 || flp->fl_type == F_UNLCK) &&
(cmd == F_SETLK || cmd == F_SETLKW)) {
flp->fl_flags &=~ FL_SLEEP;
if ((code == 0 || afs_get_flock_type(flp) == F_UNLCK) &&
(cmd == F_SETLK || cmd == F_SETLKW)) {
afs_clear_flock_sleep(flp);
code = flock_lock_file_wait(fp, flp);
if (code && flp->fl_type != F_UNLCK) {
if (code && afs_get_flock_type(flp) != F_UNLCK) {
struct AFS_FLOCK flock2;
flock2 = flock;
flock2.l_type = F_UNLCK;
@ -826,8 +881,8 @@ afs_linux_flock(struct file *fp, int cmd, struct file_lock *flp) {
}
}
/* Convert flock back to Linux's file_lock */
flp->fl_type = flock.l_type;
flp->fl_pid = flock.l_pid;
afs_set_flock_type(flp, flock.l_type);
afs_set_flock_pid(flp, flock.l_pid);
crfree(credp);
return code;

1
src/cf/linux-kernel-assorted.m4
View File

@ -59,6 +59,7 @@ LINUX_D_INVALIDATE_IS_VOID
LINUX_KERNEL_READ_OFFSET_IS_LAST
LINUX_KEYRING_SEARCH_TAKES_RECURSE
LINUX_GENERIC_FILLATTR_TAKES_REQUEST_MASK
LINUX_FILE_LOCK_CORE
])

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

@ -867,3 +867,21 @@ AC_DEFUN([LINUX_GENERIC_FILLATTR_TAKES_REQUEST_MASK], [
[define if your generic_fillattr has the request_mask_parameter],
[])
])
dnl linux 6.9 moved and renamed fl_type, fl_pid and fl_flags
dnl from file_lock into a new structure file_lock_core. Check for these as a
dnl single test
AC_DEFUN([LINUX_FILE_LOCK_CORE], [
AC_CHECK_LINUX_BUILD([whether fl_type fl_pid and fl_flags are in structure file_lock_core],
[ac_cv_linux_file_lock_core],
[#include <linux/filelock.h>],
[
static struct file_lock flock;
flock.c.flc_type = 0;
flock.c.flc_pid = 0;
flock.c.flc_flags = 0;
],
[HAVE_FILE_LOCK_CORE],
[define if file_lock_core exists],
[])
])