- make compiler happy with initialized value

- don't set fail flag for mdc

diff --git a/lustre/cmm/cmm_split.c b/lustre/cmm/cmm_split.c
index e7e4bc2..8218521 100644 (file)
--- a/lustre/cmm/cmm_split.c
+++ b/lustre/cmm/cmm_split.c
@@ -174,7 +174,7 @@ static int cmm_slaves_create(const struct lu_env *env,
         struct lmv_stripe_md *lmv = NULL, *slave_lmv = NULL;
         struct lu_fid *lf = cmm2fid(md2cmm_obj(mo));
         struct mdc_device *mc, *tmp;
-        int lmv_size, i = 1, rc;
+        int lmv_size, i = 1, rc = 0;
         ENTRY;
 
         lmv_size = cmm_md_size(cmm->cmm_tgt_count + 1);

diff --git a/lustre/cmm/mdc_device.c b/lustre/cmm/mdc_device.c
index c98f10b..dada5be 100644 (file)
--- a/lustre/cmm/mdc_device.c
+++ b/lustre/cmm/mdc_device.c
@@ -156,7 +156,7 @@ static int mdc_obd_del(const struct lu_env *env, struct mdc_device *mc,
         if (mdc_obd) {
                 mdc_obd->obd_no_recov = mdt_obd->obd_no_recov;
                 mdc_obd->obd_force = mdt_obd->obd_force;
-                mdc_obd->obd_fail = mdt_obd->obd_fail;
+                mdc_obd->obd_fail = 0;
         }
 
         rc = obd_fid_fini(desc->cl_exp);

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index baf2f72..76946e2 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -1711,7 +1711,7 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id)
         LASSERT (list_empty(&rs->rs_obd_list));
         LASSERT (list_empty(&rs->rs_exp_list));
 
-        exp = class_export_get (req->rq_export);
+        exp = class_export_get(req->rq_export);
         obd = exp->exp_obd;
 
         /* disable reply scheduling onto srv_reply_queue while I'm setting up */