remove unused stuff

diff --git a/lustre/include/linux/lustre_cfg.h b/lustre/include/linux/lustre_cfg.h
index 0302cc6..073ac8f 100644 (file)
--- a/lustre/include/linux/lustre_cfg.h
+++ b/lustre/include/linux/lustre_cfg.h
@@ -58,8 +58,6 @@ enum lcfg_command_type {
         LCFG_LOV_ADD_INA    = 0x00ce013,
         LCFG_ADD_MDC        = 0x00cf014,
         LCFG_DEL_MDC        = 0x00cf015,
-        LCFG_LMV_ADD_OBD    = 0x00cf016,
-        LCFG_LMV_DEL_OBD    = 0x00cf017,
 };
 
 struct lustre_cfg_bufs {

diff --git a/lustre/include/linux/lustre_idl.h b/lustre/include/linux/lustre_idl.h
index d62de6c..2e3e3c4 100644 (file)
--- a/lustre/include/linux/lustre_idl.h
+++ b/lustre/include/linux/lustre_idl.h
@@ -1136,14 +1136,8 @@ struct lmv_desc {
         __u32 ld_active_tgt_count;         /* how many active */
         struct obd_uuid ld_uuid;
 };
-struct cmm_desc {
-        __u32 ld_tgt_count;                /* how many MDS's */
-        __u32 ld_active_tgt_count;         /* how many active */
-        struct obd_uuid ld_uuid;
-};
 
 extern void lustre_swab_lmv_desc (struct lmv_desc *ld);
-extern void lustre_swab_cmm_desc (struct cmm_desc *ld);
 /*end adding MDT by huanghua@clusterfs.com*/
 
 struct md_fld {

diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index 08a6dcb..b5e4cbb 100644 (file)
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -925,12 +925,6 @@ void lustre_swab_lmv_desc (struct lmv_desc *ld)
         __swab32s (&ld->ld_active_tgt_count);
         /* uuid endian insensitive */
 }
-void lustre_swab_cmm_desc (struct cmm_desc *ld)
-{
-        __swab32s (&ld->ld_tgt_count);
-        __swab32s (&ld->ld_active_tgt_count);
-        /* uuid endian insensitive */
-}
 /*end adding MDT by huanghua@clusterfs.com*/
 void lustre_swab_md_fld (struct md_fld *mf)
 {

diff --git a/lustre/utils/llog_reader.c b/lustre/utils/llog_reader.c
index 7cf6a89..0a7ea24 100644 (file)
--- a/lustre/utils/llog_reader.c
+++ b/lustre/utils/llog_reader.c
@@ -248,14 +248,6 @@ static void print_setup_cfg(struct lustre_cfg *lcfg)
                 lmvdesc = (struct lmv_desc*)(lustre_cfg_string(lcfg, 1));
                 printf("count=%d ", lmvdesc->ld_tgt_count);
                 printf("atcive_count=%d", lmvdesc->ld_active_tgt_count);
-        } else if (!strcmp(type,"cmm")){
-                struct cmm_desc *cmmdesc;
-                printf("cmm_setup ");
-                printf("0:%s  ", name);
-                printf("1:(struct cmm_desc)\n");
-                cmmdesc = (struct cmm_desc*)(lustre_cfg_string(lcfg, 1));
-                printf("count=%d ", cmmdesc->ld_tgt_count);
-                printf("atcive_count=%d", cmmdesc->ld_active_tgt_count);
         } else {
                 printf("setup ");
                 print_1_cfg(lcfg);