STABLE14-linux-posix-lock-file-api-fix-20060714

fix lock enrollment for older kernels

(cherry picked from commit 3a8a83c061965195c4842d89b888e37cd4b33ee3)

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index 8bbb81487b1491868379bd848184af50a140470c..93a3f2f70bb585f65dc3e01d1623724657aff350 100644 (file)
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -465,12 +465,14 @@ afs_linux_lock(struct file *fp, int cmd, struct file_lock *flp)
 
 #ifdef AFS_LINUX24_ENV
     if (code == 0 && (cmd == F_SETLK || cmd == F_SETLKW)) {
+#ifdef AFS_LINUX26_ENV
        struct file_lock flp2;
        flp2 = *flp;
-#ifdef AFS_LINUX26_ENV
        flp2.fl_flags &=~ FL_SLEEP;
-#endif
        code = posix_lock_file(fp, &flp2);
+#else
+       code = posix_lock_file(fp, flp, 0);
+#endif 
        osi_Assert(code != -EAGAIN); /* there should be no conflicts */
        if (code) {
            struct AFS_FLOCK flock2;