- filter_set_info_async() initializes local storage

 - remove old code in obd_mount.c

diff --git a/lustre/dmu-osd/osd_handler.c b/lustre/dmu-osd/osd_handler.c
index 4f96923..05810af 100644 (file)
--- a/lustre/dmu-osd/osd_handler.c
+++ b/lustre/dmu-osd/osd_handler.c
@@ -872,8 +872,7 @@ static int osd_init_capa_ctxt(const struct lu_env *env, struct dt_device *d,
 static char *osd_label_get(const struct lu_env *env, const struct dt_device *d)
 {
         //struct osd_device *dev = osd_dt_dev(d);
-        CERROR("return label NEW:OST\n");
-        return ("NEW:OST");
+        return "lustre*OSTXXXX";
         LBUG();
         RETURN(NULL);
 }

diff --git a/lustre/mgs/mgs_handler.c b/lustre/mgs/mgs_handler.c
index dbd2c45..ca5985d 100644 (file)
--- a/lustre/mgs/mgs_handler.c
+++ b/lustre/mgs/mgs_handler.c
@@ -477,7 +477,7 @@ static int mgs_parse_label_to_mti(struct mgs_target_info *mti)
                 mti->mti_stripe_index = simple_strtoul(mti->mti_svname+i,NULL,10);
         }
 
-        CDEBUG(D_MOUNT, "register to %s with name '%s' and flags %u\n",
+        CDEBUG(D_MGS, "register to %s with name '%s' and flags %u\n",
                mti->mti_fsname, mti->mti_svname, mti->mti_flags);
 
 out: