Branch b_release_1_8_1

b=18092
i=adilger
i=johann (patch from Girish)

Fix warnings.

diff --git a/lnet/selftest/console.c b/lnet/selftest/console.c
index 943f332..0b19e72 100644 (file)
--- a/lnet/selftest/console.c
+++ b/lnet/selftest/console.c
@@ -1708,8 +1708,8 @@ lstcon_session_new(char *name, int key,
         if (rc != 0) {
                 lstcon_batch_t *bat;
 
-                lstcon_batch_find(LST_DEFAULT_BATCH, &bat);
-                lstcon_batch_destroy(bat);
+                if (lstcon_batch_find(LST_DEFAULT_BATCH, &bat) == 0)
+                        lstcon_batch_destroy(bat);
 
                 return rc;
         }

diff --git a/lustre/tests/mpi/createmany-mpi.c b/lustre/tests/mpi/createmany-mpi.c
index 6e558fc..d203fa6 100644 (file)
--- a/lustre/tests/mpi/createmany-mpi.c
+++ b/lustre/tests/mpi/createmany-mpi.c
@@ -72,7 +72,7 @@ int rprintf(int rank, int loop, const char *fmt, ...)
 int main(int argc, char ** argv)
 {
         int i, rc = 0, do_open = 0, do_link = 0, rank;
-        char format[4096], *fmt, *tgt;
+        char format[4096], *fmt, *tgt = NULL;
         char filename[4096];
         long start, last, end;
         long begin = 0, count;