X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fobdctl.h;h=cd7b4304de89f1d202d3a9cc8e731f8cda39555e;hp=0ab2c8a8466910acd2402124fa1e9b5e54f4c342;hb=3d21af5fd098ba971f835e94fbe1f61b6a994a09;hpb=090c677210ee2946d99c71412e4ff762bb300f4f

diff --git a/lustre/utils/obdctl.h b/lustre/utils/obdctl.h
index 0ab2c8a..cd7b430 100644
--- a/lustre/utils/obdctl.h
+++ b/lustre/utils/obdctl.h
@@ -1,28 +1,9 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- *  Copyright (C) 2002 Cluster File Systems, Inc.
- *
- *   Author: Peter J. Braam <braam@clusterfs.com>
- *   Author: Phil Schwan <phil@clusterfs.com>
- *   Author: Robert Read <rread@clusterfs.com> 
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre 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 for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
+ *   This file is part of Lustre, http://www.lustre.org
  */
+
 #ifndef _OBDCTL_H_
 #define _OBDCTL_H_
 
@@ -30,10 +11,10 @@
 #include <liblustre.h>
 #endif
 
-#include <linux/lustre_lib.h>
-#include <linux/lustre_idl.h>
-#include <linux/lustre_dlm.h>
-#include <linux/lustre_cfg.h>
+#include <lustre_lib.h>
+#include <lustre/lustre_idl.h>
+#include <lustre_dlm.h>
+#include <lustre_cfg.h>
 
 /* obd.c */
 int do_disconnect(char *func, int verbose);
@@ -45,9 +26,8 @@ int jt_opt_device(int argc, char **argv);
 int jt_opt_threads(int argc, char **argv);
 int jt_opt_net(int argc, char **argv);
 
+int jt_obd_get_device();
 int jt_obd_device(int argc, char **argv);
-int jt_obd_connect(int argc, char **argv);
-int jt_obd_disconnect(int argc, char **argv);
 int jt_obd_detach(int argc, char **argv);
 int jt_obd_cleanup(int argc, char **argv);
 int jt_obd_no_transno(int argc, char **argv);
@@ -56,29 +36,21 @@ int jt_obd_abort_recovery(int argc, char **argv);
 int jt_obd_list(int argc, char **argv);
 int jt_obd_create(int argc, char **argv);
 int jt_obd_setattr(int argc, char **argv);
+int jt_obd_test_setattr(int argc, char **argv);
 int jt_obd_destroy(int argc, char **argv);
 int jt_obd_getattr(int argc, char **argv);
 int jt_obd_test_getattr(int argc, char **argv);
 int jt_obd_test_brw(int argc, char **argv);
-int jt_obd_get_stripe(int argc, char **argv);
-int jt_obd_set_stripe(int argc, char **argv);
-int jt_obd_unset_stripe(int argc, char **argv);
 int jt_obd_lov_getconfig(int argc, char **argv);
 int jt_obd_test_ldlm(int argc, char **argv);
 int jt_obd_ldlm_regress_start(int argc, char **argv);
 int jt_obd_ldlm_regress_stop(int argc, char **argv);
-int jt_obd_dump_ldlm(int argc, char **argv);
 int jt_obd_activate(int argc, char **argv);
 int jt_obd_deactivate(int argc, char **argv);
 int jt_obd_recover(int argc, char **argv);
 int jt_obd_mdc_lookup(int argc, char **argv);
 int jt_get_version(int argc, char **argv);
-int jt_obd_close_uuid(int argc, char **argv);
-int jt_cfg_record(int argc, char **argv);
-int jt_cfg_endrecord(int argc, char **argv);
-int jt_cfg_parse(int argc, char **argv);
 int jt_cfg_dump_log(int argc, char **argv);
-int jt_cfg_clear_log(int argc, char **argv);
 
 int jt_llog_catlist(int argc, char **argv);
 int jt_llog_info(int argc, char **argv);
@@ -88,24 +60,33 @@ int jt_llog_remove(int argc, char **argv);
 int jt_llog_check(int argc, char **argv);
 
 int lcfg_ioctl(char * func, int dev_id, struct lustre_cfg *lcfg);
+int lcfg_mgs_ioctl(char *func, int dev_id, struct lustre_cfg *lcfg);
 int parse_devname(char *func, char *name);
 char *jt_cmdname(char *func);
 
 
-/* lustre_cfg.h */
+/* lustre_cfg.c */
+int lcfg_set_devname(char *name);
+char *lcfg_get_devname(void);
 int jt_lcfg_device(int argc, char **argv);
 int jt_lcfg_newdev(int argc, char **argv);
 int jt_lcfg_attach(int argc, char **argv);
 int jt_lcfg_setup(int argc, char **argv);
 int jt_lcfg_add_uuid(int argc, char **argv);
 int jt_lcfg_del_uuid(int argc, char **argv);
-int jt_lcfg_lov_setup(int argc, char **argv);
-int jt_lcfg_lmv_setup(int argc, char **argv);
-int jt_lcfg_mount_option(int argc, char **argv);
 int jt_lcfg_del_mount_option(int argc, char **argv);
 int jt_lcfg_set_timeout(int argc, char **argv);
-int jt_lcfg_set_lustre_upcall(int argc, char **argv);
+int jt_lcfg_add_conn(int argc, char **argv);
+int jt_lcfg_del_conn(int argc, char **argv);
+int jt_lcfg_param(int argc, char **argv);
+int jt_lcfg_mgsparam(int argc, char **argv);
+int jt_lcfg_getparam(int argc, char **argv);
+int jt_lcfg_setparam(int argc, char **argv);
+
+int obd_add_uuid(char *uuid, lnet_nid_t nid);
 
-int obd_add_uuid(char *uuid, ptl_nid_t nid, int nal);
+int jt_blockdev_attach(int argc, char **argv);
+int jt_blockdev_detach(int argc, char **argv);
+int jt_blockdev_info(int argc, char **argv);
 
 #endif