[OpenAFS-devel] 1.4.2-beta2 fails to build on 2.4 kernel (FC1)

[Derek Atkins]

--=-=-=

Chaskiel M Grundman <cg2v@andrew.cmu.edu> writes:

> --On Wednesday, July 12, 2006 06:22:53 PM -0400 Derek Atkins 
> <warlord@MIT.EDU> wrote:
>
>> Do you want me to mail the corrected patch to -bugs or can you
>> commit it as-is with the one-character change?
> I don't commit things. You may send the fixed patch to -bugs

Okay.  This message is bcc'd to -bugs.  Corrected patch is
attached.  Thanks for the pointer!

-derek


--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment;
 filename=openafs-1.4.2-beta2-posixlock.patch
Content-Description: patch for posix lock on Linux 2.4 kernel

--- src/afs/LINUX/osi_vnodeops.c~	2006-06-13 12:00:38.000000000 -0400
+++ src/afs/LINUX/osi_vnodeops.c	2006-07-12 12:41:11.000000000 -0400
@@ -465,12 +465,14 @@
 
 #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;

--=-=-=


-- 
       Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
       Member, MIT Student Information Processing Board  (SIPB)
       URL: http://web.mit.edu/warlord/    PP-ASEL-IA     N1NWH
       warlord@MIT.EDU                        PGP key available

--=-=-=--