Branch: b_new_cmd

1) fix a typo in mdd_set_lov_md, found by nikita
2) init credits in mdd LCFG_SETUP setup, which may fix b11016

diff --git a/lustre/mdd/mdd_handler.c b/lustre/mdd/mdd_handler.c
index 0924b0f..6527482 100644 (file)
--- a/lustre/mdd/mdd_handler.c
+++ b/lustre/mdd/mdd_handler.c
@@ -909,6 +909,7 @@ static int mdd_process_config(const struct lu_env *env,
                 rc = mdd_mount(env, m);
                 if (rc)
                         GOTO(out, rc);
+                rc = mdd_txn_init_credits(env, m);
                 break;
         case LCFG_CLEANUP:
                 mdd_device_shutdown(env, m);

diff --git a/lustre/mdd/mdd_lov.c b/lustre/mdd/mdd_lov.c
index 3b38741..86ab588 100644 (file)
--- a/lustre/mdd/mdd_lov.c
+++ b/lustre/mdd/mdd_lov.c
@@ -296,7 +296,7 @@ int mdd_lov_set_md(const struct lu_env *env, struct mdd_object *pobj,
         } else  if (S_ISDIR(mode)) {
                 if (lmmp == NULL && lmm_size == 0) {
                         struct lov_mds_md *lmm = &mdd_env_info(env)->mti_lmm;
-                        int size = sizeof(lmm);
+                        int size = sizeof(*lmm);
 
                         /* Get parent dir stripe and set */
                         if (pobj != NULL)