b=2255

r=adliger

fix bug in sanity test 60 where llog_test was oopsing in insmod on ia64

diff --git a/lustre/obdclass/llog_test.c b/lustre/obdclass/llog_test.c
index 137b5b7..1660657 100644 (file)
--- a/lustre/obdclass/llog_test.c
+++ b/lustre/obdclass/llog_test.c
@@ -606,6 +606,10 @@ static int llog_test_setup(struct obd_device *obd, obd_count len, void *buf)
         RETURN(rc);
 }
 
+static struct lprocfs_vars lprocfs_ost_obd_vars[] = { {0} };
+static struct lprocfs_vars lprocfs_ost_module_vars[] = { {0} };
+LPROCFS_INIT_VARS(ost, lprocfs_ost_module_vars, lprocfs_ost_obd_vars)
+
 static int llog_test_attach(struct obd_device *dev, obd_count len, void *data)
 {
         struct lprocfs_static_vars lvars;
@@ -630,11 +634,15 @@ static struct obd_ops llog_obd_ops = {
 
 };
 
+static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
+static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
+LPROCFS_INIT_VARS(llog_test, lprocfs_module_vars, lprocfs_obd_vars)
+
 static int __init llog_test_init(void)
 {
         struct lprocfs_static_vars lvars;
 
-        lprocfs_init_multi_vars(0, &lvars);
+        lprocfs_init_vars(llog_test, &lvars);
         return class_register_type(&llog_obd_ops,lvars.module_vars,"llog_test");
 }
 

diff --git a/lustre/tests/run-llog.sh b/lustre/tests/run-llog.sh
index 22434b7..6a4ffc1 100644 (file)
--- a/lustre/tests/run-llog.sh
+++ b/lustre/tests/run-llog.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 PATH=`dirname $0`:`dirname $0`/../utils:$PATH
+TMP=${TMP:-/tmp}
 insmod ../obdclass/llog_test.o || exit 1
-lctl modules > /r/tmp/ogdb-`hostname`
+lctl modules > $TMP/ogdb-`hostname`
 echo "NOW reload debugging syms.."
 
 RC=0