- added standard CFS headers in some source files.

- fixes in llog_test.c and tests/run-llog.sh. By now sanity.sh test_60 passes.

diff --git a/lustre/cmobd/cm_internal.h b/lustre/cmobd/cm_internal.h
index 5d32eb6..40b49a3 100644 (file)
--- a/lustre/cmobd/cm_internal.h
+++ b/lustre/cmobd/cm_internal.h
@@ -1,10 +1,22 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- * Copyright (C) 2003 Cluster File Systems, Inc.
+ * Copyright (C) 2002, 2003, 2004 Cluster File Systems, Inc.
  *
- * This code is issued under the GNU General Public License.
- * See the file COPYING in this distribution
+ *   This file is part of Lustre, http://www.lustre.org.
+ *
+ *   Lustre is free software; you can redistribute it and/or
+ *   modify it under the terms of version 2 of the GNU General Public
+ *   License as published by the Free Software Foundation.
+ *
+ *   Lustre is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Lustre; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #ifndef CM_INTERNAL_H

diff --git a/lustre/cmobd/lproc_cm.c b/lustre/cmobd/lproc_cm.c
index 7951a73..f5c6efc 100644 (file)
--- a/lustre/cmobd/lproc_cm.c
+++ b/lustre/cmobd/lproc_cm.c
@@ -28,10 +28,7 @@
 static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
 static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
 #else
-
 static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
 static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
-
 #endif /* LPROCFS */
-
 LPROCFS_INIT_VARS(cmobd, lprocfs_module_vars, lprocfs_obd_vars)

diff --git a/lustre/lmv/lmv_intent.c b/lustre/lmv/lmv_intent.c
index e4b7e22..436fb48 100644 (file)
--- a/lustre/lmv/lmv_intent.c
+++ b/lustre/lmv/lmv_intent.c
@@ -253,7 +253,7 @@ int lmv_intent_getattr(struct obd_export *exp, struct lustre_id *pid,
                                 mds = id_group(&rpid);
                         }
                         lmv_put_obj(obj);
-               }
+                }
 #endif
         } else {
                 CDEBUG(D_OTHER, "INTENT getattr for %*s on "DLID4"\n",

diff --git a/lustre/lmv/lmv_internal.h b/lustre/lmv/lmv_internal.h
index fa21f65..178eb95 100644 (file)
--- a/lustre/lmv/lmv_internal.h
+++ b/lustre/lmv/lmv_internal.h
@@ -1,3 +1,24 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ * Copyright (C) 2002, 2003, 2004 Cluster File Systems, Inc.
+ *
+ *   This file is part of Lustre, http://www.lustre.org.
+ *
+ *   Lustre is free software; you can redistribute it and/or
+ *   modify it under the terms of version 2 of the GNU General Public
+ *   License as published by the Free Software Foundation.
+ *
+ *   Lustre is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Lustre; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
 #ifndef _LMV_INTERNAL_H_
 #define _LMV_INTERNAL_H_
 

diff --git a/lustre/obdclass/llog_test.c b/lustre/obdclass/llog_test.c
index 3ceaca8..c947925 100644 (file)
--- a/lustre/obdclass/llog_test.c
+++ b/lustre/obdclass/llog_test.c
@@ -669,7 +669,7 @@ static int llog_test_attach(struct obd_device *dev, obd_count len, void *data)
 {
         struct lprocfs_static_vars lvars;
 
-        lprocfs_init_vars(ost, &lvars);
+        lprocfs_init_vars(llog_test, &lvars);
         return lprocfs_obd_attach(dev, lvars.obd_vars);
 }
 
@@ -697,7 +697,9 @@ static int __init llog_test_init(void)
         struct lprocfs_static_vars lvars;
 
         lprocfs_init_vars(llog_test, &lvars);
-        return class_register_type(&llog_obd_ops, NULL, lvars.module_vars,
+       
+        return class_register_type(&llog_obd_ops, NULL, 
+                                  lvars.module_vars,
                                    "llog_test");
 }
 

diff --git a/lustre/tests/run-llog.sh b/lustre/tests/run-llog.sh
index b7201f2..be3449c 100644 (file)
--- a/lustre/tests/run-llog.sh
+++ b/lustre/tests/run-llog.sh
@@ -2,11 +2,15 @@
 PATH=`dirname $0`:`dirname $0`/../utils:$PATH
 TMP=${TMP:-/tmp}
 
-MDS=`ls /proc/fs/lustre/mds | grep -v num_refs | head -n 1`
+MDS=`find /proc/fs/lustre/mds/* -type d | head -n1 | sed 's/.*\///'`
 [ -z "$MDS" ] && echo "no MDS available, skipping llog test" && exit 0
 
 insmod ../obdclass/llog_test.o || exit 1
 lctl modules > $TMP/ogdb-`hostname`
+
+# take care of UML developers
+[ -f /r/$TMP/ogdb-`hostname` ] && 
+    cp -f $TMP/ogdb-`hostname` /r/$TMP/ogdb-`hostname`
 echo "NOW reload debugging syms.."
 
 RC=0