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

FIXES 58590

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

(cherry picked from commit ad98eacdadf6b9e079d1606f40cfc352450650a1)

diff --git a/acinclude.m4 b/acinclude.m4
index 1b14548075fbfbb93de6ae53d8384a2347b62bf9..9f6436dd4e248ec68d9ecb7cd9c0e5610cff9e1c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -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])

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index adb3ee5ee0ae17aac13583bfcdb8189c3d3cbec8..e7677f5debd78d3a4d92986938e2aef20863cf68 100644 (file)
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -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;