[Linux-cluster] Compile problem - kernel patches updated?

[Fredric Isaman]

I am trying to compile from a CVS download taken on Aug 22.

(Using linux kernel 2.6.7)
After patching the kernel, I try to compile in the /cluster using
'configure --kernel_src=/path/to/kernel; make install'.

I get the following error:
  CC [M]  /nfs/iisaman/gfs/cvs20040822/cluster/dlm-kernel/src/queries.o
/nfs/iisaman/gfs/cvs20040822/cluster/dlm-kernel/src/queries.c: In function
`remote_query':
/nfs/iisaman/gfs/cvs20040822/cluster/dlm-kernel/src/queries.c:338: error:
structure has no member named `lki_ownpid'


The compile seems to be using the kernel source includes, which do not
match those in the cluster directories.  Do I need to do a diff and create
my own patches, or am I doing something wrong?

For example:
> diff -u dlm-kernel/src/dlm.h $KERNELSRC/include/cluster/dlm.h
@@ -241,7 +241,6 @@
         int lki_mstlkid;        /* Lock ID on master node */
        int lki_parent;
        int lki_node;           /* Originating node (not master) */
-       int lki_ownpid;         /* Owner pid on originating node */
        uint8_t lki_state;      /* Queue the lock is on */
        uint8_t lki_grmode;     /* Granted mode */
        uint8_t lki_rqmode;     /* Requested mode */



Thanks,
	Fred