Branch b1_6

Quiet build warnings when building MPI test programs.

lustre/tests/createmany-mpi.c

@@ -56,6 +56,7 @@ int main(int argc, char ** argv)
 
         if (strcmp(argv[1], "-o") == 0) {
                 do_open = 1;
+                tgt = NULL;
         } else if (strncmp(argv[1], "-l", 2) == 0 && argv[1][2]) {
                 tgt = argv[1] + 2;
                 do_link = 1;

lustre/tests/parallel_grouplock.c

@@ -106,7 +106,7 @@ void grouplock_test1(char *filename, int fd, char *errmsg)
         if (rank == 0) {
                 int iter = MAX_WAITING_TIME;
                 int flag1, flag2;
-                
+
                 /* reading task will tell us when it completes */
                 MPI_Irecv(&temp1, 1, MPI_INT, 1, 1, MPI_COMM_WORLD, &req1);
                 /* 2nd locking task will tell us when it completes */
@@ -140,7 +140,7 @@ void grouplock_test1(char *filename, int fd, char *errmsg)
         if (rank == 0) {
                 int iter = MAX_WAITING_TIME;
                 int flag1;
-                
+
                 do {
                         iter--;
                         if (!iter) {
@@ -217,7 +217,7 @@ void grouplock_test2(char *filename, int fd, char *errmsg)
         if (rank == 0) {
                 int iter = MAX_WAITING_TIME;
                 int flag1, flag2, flag3;
-                
+
                 /* 2nd locking task will tell us when it completes */
                 MPI_Irecv(&temp1, 1, MPI_INT, 1, 1, MPI_COMM_WORLD, &req1);
                 /* 3nd locking task will tell us when it completes */
@@ -284,7 +284,7 @@ void grouplock_test2(char *filename, int fd, char *errmsg)
         if (rank == 0) {
                 int iter = MAX_WAITING_TIME;
                 int flag3;
-                
+
                 do {
                         iter--;
                         if (!iter) {
@@ -366,7 +366,7 @@ void grouplock_test3(char *filename, int fd, char *errmsg)
         if (rank == 0) {
                 int iter = MAX_WAITING_TIME;
                 int flag1, flag2;
-                
+
                 /* reading task will tell us when it completes */
                 MPI_Irecv(&temp1, 1, MPI_INT, 1, 1, MPI_COMM_WORLD, &req1);
                 /* 2nd locking task will tell us when it completes */
@@ -400,7 +400,7 @@ void grouplock_test3(char *filename, int fd, char *errmsg)
         if (rank == 0) {
                 int iter = MAX_WAITING_TIME;
                 int flag1;
-                
+
                 do {
                         iter--;
                         usleep(100);
@@ -418,7 +418,7 @@ void grouplock_test3(char *filename, int fd, char *errmsg)
                                 filename, rc);
                         FAIL(errmsg);
                 }
-                
+
                 do {
                         iter--;
                         if (!iter) {
@@ -435,7 +435,7 @@ void grouplock_test3(char *filename, int fd, char *errmsg)
 
 }
 
-/* 
+/*
  * process1 attempts CW(gid=1) -- granted
  * process2 attempts PR on non-blocking fd -> should return -EWOULDBLOCK
  * process3 attempts CW(gid=2) on non-blocking fd -> should return -EWOULDBLOCK
@@ -501,7 +501,7 @@ void grouplock_test4(char *filename, int fd, char *errmsg)
                 int flag1, flag2;
                 MPI_Request req1, req2;
                 int temp1, temp2;
-                
+
                 /* reading task will tell us when it completes */
                 MPI_Irecv(&temp1, 1, MPI_INT, 1, 1, MPI_COMM_WORLD, &req1);
                 /* 2nd locking task will tell us when it completes */
@@ -536,9 +536,7 @@ void grouplock_test4(char *filename, int fd, char *errmsg)
  */
 void grouplock_test5(char *filename, int fd, char *errmsg)
 {
-        int rc, count, gid = 1;
-        char buf[LPGL_FILEN];
-        char zeros[LPGL_FILEN];
+        int rc, gid = 1;
         MPI_Request req1, req2;
         int temp1, temp2;
 
@@ -565,7 +563,7 @@ void grouplock_test5(char *filename, int fd, char *errmsg)
         if (rank == 0) {
                 int iter = MAX_WAITING_TIME;
                 int flag1, flag2;
-                
+
                 /* 3rd locking task will tell us when it completes */
                 MPI_Irecv(&temp1, 1, MPI_INT, 1, 1, MPI_COMM_WORLD, &req1);
                 /* 2nd locking task will tell us when it completes */
@@ -592,7 +590,7 @@ void grouplock_test5(char *filename, int fd, char *errmsg)
                                 filename, rc);
                         FAIL(errmsg);
                 }
-                
+
                 do {
                         iter--;
                         if (!iter) {
@@ -615,8 +613,6 @@ void grouplock_test5(char *filename, int fd, char *errmsg)
         }
 
         MPI_Barrier(MPI_COMM_WORLD);
-
-
 }
 
 /*
@@ -653,7 +649,7 @@ void grouplock_errorstest(char *filename, int fd, char *errmsg)
 
         /* To not do lots of separate tests with lots of fd opening/closing,
            different parts of this test are performed in different processes */
-           
+
         if (rank == 0 || rank == 1 ) {
                 if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) {
                         sprintf(errmsg, "ioctl GROUP_LOCK of file %s return %d",
@@ -668,7 +664,7 @@ void grouplock_errorstest(char *filename, int fd, char *errmsg)
                         if (errno != EINVAL) {
                                 sprintf(errmsg, "Double GROUP lock failed with errno %d instead of EINVAL\n", errno);
                                 FAIL(errmsg);
-                        } 
+                        }
                 } else {
                         FAIL("Taking second GROUP lock on same fd succeed\n");
                 }
@@ -680,7 +676,7 @@ void grouplock_errorstest(char *filename, int fd, char *errmsg)
                         if (errno != EINVAL) {
                                 sprintf(errmsg, "Double GROUP lock different gid failed with errno %d instead of EINVAL\n", errno);
                                 FAIL(errmsg);
-                        } 
+                        }
                 } else {
                         FAIL("Taking second GROUP lock on same fd, different gid, succeed\n");
                 }
@@ -693,7 +689,7 @@ void grouplock_errorstest(char *filename, int fd, char *errmsg)
                                 sprintf(errmsg, "GROUP unlock with wrong gid failed with errno %d instead of EINVAL\n",
                                         errno);
                                 FAIL(errmsg);
-                        } 
+                        }
                 } else {
                         FAIL("GROUP unlock with wrong gid succeed\n");
                 }
@@ -714,7 +710,7 @@ void grouplock_errorstest(char *filename, int fd, char *errmsg)
                                 sprintf(errmsg, "GROUP unlock on never locked fd failed with errno %d instead of EINVAL\n",
                                         errno);
                                 FAIL(errmsg);
-                        } 
+                        }
                 } else {
                         FAIL("GROUP unlock on never locked fd succeed\n");
                 }
@@ -723,7 +719,7 @@ void grouplock_errorstest(char *filename, int fd, char *errmsg)
 
 void grouplock_file(char *name, int items)
 {
-        int i, fd;
+        int fd;
         char filename[MAX_FILENAME_LEN];
         char errmsg[MAX_FILENAME_LEN+20];
 
@@ -821,7 +817,6 @@ int main(int argc, char *argv[])
 {
         char c;
         int i, iterations = 1;
-        int tr = 1;
 
         /* Check for -h parameter before MPI_Init so the binary can be
            called directly, without, for instance, mpirun */
@@ -875,8 +870,8 @@ int main(int argc, char *argv[])
         }
 
         if (testdir == NULL && rank == 0) {
-                fprintf(stderr, "Please specify a test directory! (\"%s -h\" for help)\n",
-                       argv[0]);
+                fprintf(stderr, "Please specify a test directory! "
+                        "(\"%s -h\" for help)\n", argv[0]);
                 MPI_Abort(MPI_COMM_WORLD, 2);
         }