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

STABLE14-linux-posix-lock-file-has-wait-arg-now-20070517

Browse Source 
FIXES 58590

hopefully this works, i can't actually try it now


(cherry picked from commit ad98eacdadf6b9e079d1606f40cfc352450650a1)
This commit is contained in:
Derrick Brashear 2007-05-17 19:38:46 +00:00
parent ecc37bec26
commit a6aed12083
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acinclude.m4
View File

@ -770,7 +770,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
AC_DEFINE(RECALC_SIGPENDING_TAKES_VOID, 1, [define if your recalc_sigpending takes void])
fi
if test "x$ac_cv_linux_kernel_posix_lock_file_wait_arg" = "xyes" ; then
AC_DEFINE(LINUX_KERNEL_POSIX_LOCK_FILE_WAIT_ARG, 1, [define if your linux kernel uses 3 arguments for posix_lock_file])
AC_DEFINE(POSIX_LOCK_FILE_WAIT_ARG, 1, [define if your linux kernel uses 3 arguments for posix_lock_file])
fi
if test "x$ac_cv_linux_kernel_is_selinux" = "xyes" ; then
AC_DEFINE(LINUX_KERNEL_IS_SELINUX, 1, [define if your linux kernel uses SELinux features])

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

@ -473,7 +473,7 @@ afs_linux_lock(struct file *fp, int cmd, struct file_lock *flp)
#ifdef AFS_LINUX24_ENV
if ((code == 0 || flp->fl_type == F_UNLCK) &&
(cmd == F_SETLK || cmd == F_SETLKW)) {
#ifdef LINUX_KERNEL_POSIX_LOCK_FILE_WAIT_ARG
#ifdef POSIX_LOCK_FILE_WAIT_ARG
code = posix_lock_file(fp, flp, 0);
#else
flp->fl_flags &=~ FL_SLEEP;