Update journal callback patch so that we can tell if it is applied.

diff --git a/lustre/mds/mds_ext3.c b/lustre/mds/mds_ext3.c
index 9c6bd38..ea01a0e 100644 (file)
--- a/lustre/mds/mds_ext3.c
+++ b/lustre/mds/mds_ext3.c
@@ -195,6 +195,7 @@ static int mds_ext3_set_last_rcvd(struct mds_obd *mds, void *handle)
                (unsigned long long)mcb->cb_last_rcvd);
         journal_callback_set(handle, mds_ext3_callback_func, mcb);
 #else
+#warning "no journal callback kernel patch, faking it..."
         {
         static long next = 0;
 

diff --git a/lustre/patches/patch-2.4.18 b/lustre/patches/patch-2.4.18
index 93e371a..6a3a9bd 100644 (file)
--- a/lustre/patches/patch-2.4.18
+++ b/lustre/patches/patch-2.4.18
@@ -128,10 +128,11 @@
        OUT_BYTE(0x00, IDE_FEATURE_REG);
 --- lum/include/linux/jbd.h.orig       Tue Apr 16 14:27:25 2002
 +++ lum/include/linux/jbd.h    Wed Apr 24 05:19:00 2002
-@@ -249,6 +249,12 @@
+@@ -249,6 +249,13 @@
        return bh->b_private;
  }
  
++#define HAVE_JOURNAL_CALLBACK
 +struct journal_callback {
 +      struct list_head jcb_list;
 +      void (*jcb_func)(void *);