Branch b1_8_gate

Remove shadow "err" variable, fix use-before-init warning.

diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c
index bd536ba..e869d62 100644 (file)
--- a/lustre/lov/lov_obd.c
+++ b/lustre/lov/lov_obd.c
@@ -1280,7 +1280,7 @@ static int lov_destroy(struct obd_export *exp, struct obdo *oa,
         struct lov_request *req;
         struct list_head *pos;
         struct lov_obd *lov;
-        int rc = 0, err;
+        int rc = 0, err = 0;
         ENTRY;
 
         ASSERT_LSM_MAGIC(lsm);
@@ -1300,7 +1300,6 @@ static int lov_destroy(struct obd_export *exp, struct obdo *oa,
                 GOTO(out, rc);
 
         list_for_each (pos, &set->set_list) {
-                int err;
                 req = list_entry(pos, struct lov_request, rq_link);
 
                 if (oa->o_valid & OBD_MD_FLCOOKIE)