LU-1406 ofd: init lu_target in OFD

[fs/lustre-release.git] / lnet / utils / lstclient.c

diff --git a/lnet/utils/lstclient.c b/lnet/utils/lstclient.c
index ec52175..d79d343 100644 (file)
--- a/lnet/utils/lstclient.c
+++ b/lnet/utils/lstclient.c
@@ -1,10 +1,41 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- * 
- * Author: Liang Zhen <liangzhen@clusterfs.com>
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
  *
- * This file is part of Lustre, http://www.lustre.org
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lnet/selftest/conctl.c
+ *
+ * Author: Liang Zhen <liangzhen@clusterfs.com>
  */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
@@ -113,7 +144,7 @@ lstjn_join_session(char *ses, char *grp)
                 return -1;
         }
 
-        fprintf(stdout, "Session %s, ID: %s, %Lu\n",
+        fprintf(stdout, "Session %s, ID: %s, "LPU64"\n",
                 ses, libcfs_nid2str(rep->join_sid.ses_nid),
                 rep->join_sid.ses_stamp);
 
@@ -153,13 +184,13 @@ main(int argc, char **argv)
                         server_mode_flag = 1;
                         break;
                 default:
-                        fprintf(stderr, usage_string);
+                        fprintf(stderr, "%s", usage_string);
                         return -1;
                 }
         }
 
         if (optind != argc || grp == NULL || ses == NULL) {
-                fprintf(stderr, usage_string);
+                fprintf(stderr, "%s", usage_string);
                 return -1;
         }
 
@@ -169,25 +200,33 @@ main(int argc, char **argv)
                 return -1;
         }
 
+        rc = cfs_wi_startup();
+        if (rc != 0) {
+                CERROR("cfs_wi_startup() failed: %d\n", rc);
+                libcfs_debug_cleanup();
+                return -1;
+        }
+
         rc = LNetInit();
         if (rc != 0) {
                 CERROR("LNetInit() failed: %d\n", rc);
+                cfs_wi_shutdown();
                 libcfs_debug_cleanup();
                 return -1;
         }
 
         if (server_mode_flag)
                 lnet_server_mode();
-        
+
         rc = lnet_selftest_init();
         if (rc != 0) {
                 fprintf(stderr, "Can't startup selftest\n");
                 LNetFini();
+                cfs_wi_shutdown();
                 libcfs_debug_cleanup();
-
                 return -1;
         }
-       
+
         rc = lstjn_join_session(ses, grp);
         if (rc != 0)
                 goto out;
@@ -211,6 +250,8 @@ out:
 
         LNetFini();
 
+        cfs_wi_shutdown();
+
         libcfs_debug_cleanup();
 
         return rc;