diff --git a/acinclude.m4 b/acinclude.m4 index a661d08668..b65f11a621 100644 --- 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 9a266034c3..8eb12f5109 100644 --- a/src/afs/LINUX/osi_vnodeops.c +++ b/src/afs/LINUX/osi_vnodeops.c @@ -491,7 +491,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;