[DRBD-user] using drbd in a monolithic kernel?

Philipp Reisner philipp.reisner at linbit.com
Thu Mar 25 14:37:00 CET 2004


Am Mittwoch, 24. März 2004 19:57 schrieb Kees Cook:
> On Wed, Mar 24, 2004 at 02:32:23PM +0100, Philipp Reisner wrote:
> > I have put it into CVS now. (Use cvs update -d to get the new directory.)
> >
> > Check it out, and tell me what is stupid about it :)
>
> It's okay.  I prefer the full include/linux just so userspace tools can be
> compiled against a patched kernel tree and not require the
> out-of-kernel-tree module sources.  But since that's a special case, no
> big deal.
>

This way it is a lot easier of the maintainer of the debian package [as far
as I understand this...]

When a monolithic kernel is build, the two header file are moved to 
include/linux/ . 
Also in that case it is possible to build the userspace tools without
the out-of-kernel-free module sources, since the include files are in
~linux/include/linux .

> I'll write a script to generate a kernel-tree patch.
>
> It looks like a few other changes didn't quite make it in, though.  I've
> attached the two missed pieces.

diff -x CVS -uNrp drbd/drbd/drbd_int.h drbd-0.7_pre2/drbd/drbd_int.h
--- drbd/drbd/drbd_int.h	2004-03-24 10:41:14.000000000 -0800
+++ drbd-0.7_pre2/drbd/drbd_int.h	2004-03-17 15:34:34.000000000 -0800
@@ -192,10 +192,12 @@ extern void drbd_assert_breakpoint(drbd_
 # define UNLOCK_SIGMASK(task,flags) 
spin_unlock_irqrestore(&task->sighand->siglock, flags)
 # define RECALC_SIGPENDING(TSK)     (recalc_sigpending_tsk(TSK))
 
+# ifndef MODULE
 // defined in drbd_main.c,
 // copied from redhat's kernel-2.4.20-13.9 kernel/signal.c
 // to avoid a recompile of the redhat kernel
 inline void recalc_sigpending_tsk(struct task_struct *t);
+# endif

What is the intention of this chunk ?

I am currently working on L26 (vanilla) and building DRBD as module, 
therefore I need this prototype.

But whith this preprocessor statements I will not get it....

Could it be that you ment 

# ifdef MODULE
   ^^
   
?

-Philipp
-- 
: Dipl-Ing Philipp Reisner                      Tel +43-1-8178292-50 :
: LINBIT Information Technologies GmbH          Fax +43-1-8178292-82 :
: Schönbrunnerstr 244, 1120 Vienna, Austria    http://www.linbit.com :



More information about the drbd-user mailing list