X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fobdctl.h;h=b81379504c630169e00e3d490bf06caf3162fabd;hb=2d8d11cfad482b0f5cde34359bec89ed2547f5be;hp=f0e1a971da52bdff22f0223a7df9ace4f42c6b4a;hpb=040033cef24c5aca2967daf2da7a862abcd074cf;p=fs%2Flustre-release.git

diff --git a/lustre/utils/obdctl.h b/lustre/utils/obdctl.h
index f0e1a97..b813795 100644
--- a/lustre/utils/obdctl.h
+++ b/lustre/utils/obdctl.h
@@ -26,12 +26,24 @@
 #ifndef _OBDCTL_H_
 #define _OBDCTL_H_
 
+#ifndef __KERNEL__
+#include <liblustre.h>
+#endif
+
+#include <linux/lustre_lib.h>
+#include <linux/lustre_idl.h>
+#include <linux/lustre_dlm.h>
+#include <linux/lustre_cfg.h>
+
+/* obd.c */
 int do_disconnect(char *func, int verbose);
- int obd_initialize(int argc, char **argv);
-void obd_cleanup(int argc, char **argv);
+int obd_initialize(int argc, char **argv);
+void obd_finalize(int argc, char **argv);
+
 
 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_device(int argc, char **argv);
 int jt_obd_connect(int argc, char **argv);
@@ -40,11 +52,8 @@ 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);
 int jt_obd_set_readonly(int argc, char **argv);
-int jt_obd_newdev(int argc, char **argv);
+int jt_obd_abort_recovery(int argc, char **argv);
 int jt_obd_list(int argc, char **argv);
-int jt_obd_attach(int argc, char **argv);
-int jt_obd_name2dev(int argc, char **argv);
-int jt_obd_setup(int argc, char **argv);
 int jt_obd_create(int argc, char **argv);
 int jt_obd_setattr(int argc, char **argv);
 int jt_obd_destroy(int argc, char **argv);
@@ -54,19 +63,47 @@ 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_setconfig(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_lov_set_osc_active(int argc, char **argv);
-int jt_obd_newconn(int argc, char **argv);
-int jt_obd_failconn(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_add_uuid(int argc, char **argv);
 int jt_obd_close_uuid(int argc, char **argv);
-int jt_obd_del_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_llog_catlist(int argc, char **argv);
+int jt_llog_info(int argc, char **argv);
+int jt_llog_print(int argc, char **argv);
+int jt_llog_cancel(int argc, char **argv);
+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 parse_devname(char *func, char *name);
+char *jt_cmdname(char *func);
+
+
+/* lustre_cfg.h */
+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_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 obd_add_uuid(char *uuid, ptl_nid_t nid, int nal);
 
 #endif