From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 24 Mar 2008 20:46:40 +0000 (+0000)
Subject: STABLE14-enable-linux-flock-20080324
X-Git-Tag: openafs-stable-1_4_7pre2~6
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=cb973c5a369a4461939b0a24b42e3f57a7a0b242;p=packages%2Fo%2Fopenafs.git

STABLE14-enable-linux-flock-20080324

LICENSE IPL10
FIXES 53457

enable flock again in 1.4; it's been on without complaint in 1.5 since the original ticket was filed
---

diff --git a/acinclude.m4 b/acinclude.m4
index aed68b066..20801b0c5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -884,7 +884,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
 		  AC_DEFINE(INIT_WORK_HAS_DATA, 1, [define if INIT_WORK takes a data (3rd) argument])
 		 fi
 		 if test "x$ac_cv_linux_fs_struct_fop_has_flock" = "xyes" ; then
-		  echo flock support is currently disabled in OpenAFS 1.4 for Linux
+		  AC_DEFINE(STRUCT_FILE_OPERATIONS_HAS_FLOCK, 1, [define if your struct file_operations has flock])
 		 fi
 		 if test "x$ac_cv_linux_fs_struct_fop_has_sendfile" = "xyes" ; then
 		  AC_DEFINE(STRUCT_FILE_OPERATIONS_HAS_SENDFILE, 1, [define if your struct file_operations has sendfile])