landing b_cmobd_merge on HEAD

[fs/lustre-release.git] / lustre / portals / utils / debug.c

diff --git a/lustre/portals/utils/debug.c b/lustre/portals/utils/debug.c
index 00a6102..66c3807 100644 (file)
--- a/lustre/portals/utils/debug.c
+++ b/lustre/portals/utils/debug.c
@@ -65,9 +65,9 @@ static int debug_mask = ~0;
 
 static const char *portal_debug_subsystems[] =
         {"undefined", "mdc", "mds", "osc", "ost", "class", "log", "llite",
-         "rpc", "mgmt", "portals", "socknal", "qswnal", "pinger", "filter",
-         "ptlbd", "echo", "ldlm", "lov", "gmnal", "router", "cobd", "ibnal",
-         "lmv", NULL};
+         "rpc", "mgmt", "portals", "libcfs", "socknal", "qswnal", "pinger", 
+         "filter", "ptlbd", "echo", "ldlm", "lov", "gmnal", "router", "cobd", 
+         "ibnal", "lmv", "smfs", "cmobd", NULL};
 static const char *portal_debug_masks[] =
         {"trace", "inode", "super", "ext2", "malloc", "cache", "info", "ioctl",
          "blocks", "net", "warning", "buffs", "other", "dentry", "portals",
@@ -183,9 +183,6 @@ static int applymask(char* procpath, int value)
         return 0;
 }
 
-extern char *dump_filename;
-extern int dump(int dev_id, int opc, void *buf);
-
 static void applymask_all(unsigned int subs_mask, unsigned int debug_mask)
 {
         if (!dump_filename) {
@@ -535,27 +532,27 @@ static struct mod_paths {
         {"obdclass", "lustre/obdclass"},
         {"llog_test", "lustre/obdclass"},
         {"ptlrpc", "lustre/ptlrpc"},
-        {"obdext2", "lustre/obdext2"},
         {"ost", "lustre/ost"},
         {"osc", "lustre/osc"},
         {"mds", "lustre/mds"},
         {"mdc", "lustre/mdc"},
         {"llite", "lustre/llite"},
+        {"smfs", "lustre/smfs"},
         {"obdecho", "lustre/obdecho"},
         {"ldlm", "lustre/ldlm"},
         {"obdfilter", "lustre/obdfilter"},
         {"extN", "lustre/extN"},
         {"lov", "lustre/lov"},
+        {"lmv", "lustre/lmv"},
         {"fsfilt_ext3", "lustre/lvfs"},
         {"fsfilt_extN", "lustre/lvfs"},
         {"fsfilt_reiserfs", "lustre/lvfs"},
-        {"mds_ext2", "lustre/mds"},
-        {"mds_ext3", "lustre/mds"},
-        {"mds_extN", "lustre/mds"},
+        {"fsfilt_smfs", "lustre/lvfs"},
         {"ptlbd", "lustre/ptlbd"},
         {"mgmt_svc", "lustre/mgmt"},
         {"mgmt_cli", "lustre/mgmt"},
-        {"lmv", "lustre/lmv"},
+        {"cobd", "lustre/cobd"},
+        {"cmobd", "lustre/cmobd"},
         {NULL, NULL}
 };