[SSI-users] Re: drbd-0.7_pre4.tar.gz

[En C. L. <en-...@hp...>]

Hi Philipp,

I'm attaching a patch to make pre4 build on RH9. It basically #undef
anything that was defined in Rh9's list.h.

En Chiang

On Mon, 2004-02-09 at 20:05, Philipp Reisner wrote:
> Am Montag, 9. Februar 2004 14:23 schrieb En Chiang Lee:
> > > Maybe adding these two lines to drbd_config.h help.
> > > --snip--
> > > // If your vendor kernel happens to have struct sighand (e.g. RH 2.4.20
> > > and later) #define SIGHAND_HACK
> > > --snap--
> >
> > Hi,
> >
> > The change helped get rid of the sigmask_lock problems, but I'm still
> > having problems with the hlist.h redefinitions. There is an overlap
> > between what is provided in the RH9 list.h and hlist.h. The errors are
> > as follows:
> >
> > gcc -D__KERNEL__
> > -I/usr/src/redhat/BUILD/kernel-2.4.20/linux-2.4.20/include -Wall
> > -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common
> > -pipe -mpreferred-stack-boundary=2 -march=i686
> > -fno-optimize-sibling-calls -DMODULE  -nostdinc -iwithprefix include
> > -DKBUILD_BASENAME=drbd_fs  -c -o drbd_fs.o drbd_fs.c
> > In file included from lru_cache.h:51,
> >                  from drbd_int.h:33,
> >                  from drbd_fs.c:47:
> > hlist.h:28: redefinition of `struct list_head'
> > hlist.h:32: redefinition of `struct list_head'
> > In file included from lru_cache.h:51,
> >                  from drbd_int.h:33,
> >                  from drbd_fs.c:47:
> > ......
> > *** AND other redefinitions like that.
> >
> >
> > To get around it, I've just replaced the list.h in my kernel build
> > directory with the list.h from 2.6. I'm not sure what problems this will
> > cause but since it's self-contained, apart from prefetch, I think that
> > should be okay.
> >
> > Any better way to get by this?
> 
> the vanilla 2.4.x list.h does not have "struct hlist". Hlist is only
> available since Linux-2.6.x. ( But it seems that RedHat have a backported
> hlist type in their kernel.)
> 
> drbd includes the hlist.h which is also a backport of Linux-2.6.x's
> hlist data type.
> 
> => clash.
> 
> Maybe add a big
> #ifndef REDHAT_KERNEL
> ...
> #endif
> to drbd's hlist.h
> 
> >
> > > BTW, I drbd-07_pre5 will be released this week.
> > >
> > > -Philipp
> >
> > Will this be tested against RH9? :-)
> 
> Not by me. Currently there are other things to fix than support for 
> RedHat kernels. -- But if you would come up with a patch to drbd-0.7_pre4
> that will make it compile on RedHat I will include this patch before -pre5.
> 
> -Philipp