merge b_devel to b_eq: 20031107

kernel passed sanity, but liblustre broken since lconf changes. need fix
by robert.

diff --git a/lustre/ptlrpc/lproc_ptlrpc.c b/lustre/ptlrpc/lproc_ptlrpc.c
index 0ff90b6..7f1264a 100644 (file)
--- a/lustre/ptlrpc/lproc_ptlrpc.c
+++ b/lustre/ptlrpc/lproc_ptlrpc.c
@@ -60,7 +60,6 @@ struct ll_rpc_opcode {
         { MDS_DISCONNECT,   "mds_disconnect" },
         { MDS_GETSTATUS,    "mds_getstatus" },
         { MDS_STATFS,       "mds_statfs" },
-        { MDS_GETLOVINFO,   "mds_getlovinfo" },
         { MDS_PIN,          "mds_pin" },
         { MDS_UNPIN,        "mds_unpin" },
         { MDS_SYNC,         "mds_sync" },
@@ -149,10 +148,10 @@ void ptlrpc_lprocfs_register(struct proc_dir_entry *root, char *dir,
         }
 }
 
-void ptlrpc_lprocfs_register_service(struct obd_device *obddev,
+void ptlrpc_lprocfs_register_service(struct proc_dir_entry *entry,
                                      struct ptlrpc_service *svc)
 {
-        ptlrpc_lprocfs_register(obddev->obd_proc_entry, svc->srv_name,
+        ptlrpc_lprocfs_register(entry, svc->srv_name,
                                 "stats", &svc->srv_procroot, 
                                 &svc->srv_stats);
 }

diff --git a/lustre/tests/leak_finder.pl b/lustre/tests/leak_finder.pl
index 62db785..5219996 100644 (file)
--- a/lustre/tests/leak_finder.pl
+++ b/lustre/tests/leak_finder.pl
@@ -86,4 +86,4 @@ foreach $key (@sorted) {
     print STDERR "*** Leak: $memory->{$key}->{size} bytes allocated at $key ($memory->{$key}->{file}:$memory->{$key}->{func}:$memory->{$key}->{lno}, debug file line $memory->{$key}->{debug_line})\n";
 }
 
-print "maximum used: $max, amount leaked: $total\n";
+print STDERR "maximum used: $max, amount leaked: $total\n";