LU-11986 lnet: properly cleanup lnet debugfs files

[fs/lustre-release.git] / libcfs / include / libcfs / libcfs.h

diff --git a/libcfs/include/libcfs/libcfs.h b/libcfs/include/libcfs/libcfs.h
index e8bee85..e3bf27d 100644 (file)
--- a/libcfs/include/libcfs/libcfs.h
+++ b/libcfs/include/libcfs/libcfs.h
@@ -15,11 +15,7 @@
  *
  * 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.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2015, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -37,19 +33,28 @@
 #ifndef __LIBCFS_LIBCFS_H__
 #define __LIBCFS_LIBCFS_H__
 
-#ifdef __KERNEL__
-# include <libcfs/linux/libcfs.h>
-# include <libcfs/types.h>
-# include "curproc.h"
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/workqueue.h>
 
-#define LIBCFS_VERSION "0.5.0"
+#include <libcfs/linux/linux-misc.h>
+#include <libcfs/linux/linux-time.h>
 
-static inline int __is_po2(unsigned long long val)
-{
-        return !(val & (val - 1));
-}
+#include <uapi/linux/lnet/libcfs_ioctl.h>
+#include <libcfs/libcfs_debug.h>
+#include <libcfs/libcfs_private.h>
+#include <libcfs/bitmap.h>
+#include <libcfs/libcfs_cpu.h>
+#include <libcfs/libcfs_prim.h>
+#include <libcfs/libcfs_string.h>
+#include <libcfs/libcfs_workitem.h>
+#include <libcfs/libcfs_hash.h>
+#include <libcfs/libcfs_heap.h>
+#include <libcfs/libcfs_fail.h>
+#include "curproc.h"
+
+#define LIBCFS_VERSION "0.5.0"
 
-#define IS_PO2(val)      __is_po2((unsigned long long)(val))
 #define PO2_ROUNDUP_TYPED(x, po2, type) (-(-(type)(x) & -(type)(po2)))
 #define LOWEST_BIT_SET(x) ((x) & ~((x) - 1))
 
@@ -62,36 +67,17 @@ static inline int __is_po2(unsigned long long val)
 # endif /* !__CHECKER__ */
 #endif /* !__must_hold */
 
-/* libcfs watchdogs */
-struct lc_watchdog;
-
-/* Add a watchdog which fires after "time" milliseconds of delay.  You have to
- * touch it once to enable it. */
-struct lc_watchdog *lc_watchdog_add(int time,
-                                    void (*cb)(pid_t pid, void *),
-                                    void *data);
-
-/* Enables a watchdog and resets its timer. */
-void lc_watchdog_touch(struct lc_watchdog *lcw, int timeout);
-#define CFS_GET_TIMEOUT(svc) (max_t(int, obd_timeout,                   \
-                          AT_OFF ? 0 : at_get(&svc->srv_at_estimate)) * \
-                          svc->srv_watchdog_factor)
-
-/* Disable a watchdog; touch it to restart it. */
-void lc_watchdog_disable(struct lc_watchdog *lcw);
-
-/* Clean up the watchdog */
-void lc_watchdog_delete(struct lc_watchdog *lcw);
-
 /* need both kernel and user-land acceptor */
 #define LNET_ACCEPTOR_MIN_RESERVED_PORT    512
 #define LNET_ACCEPTOR_MAX_RESERVED_PORT    1023
 
-/*
- * Drop into debugger, if possible. Implementation is provided by platform.
- */
-
-void cfs_enter_debugger(void);
+extern struct blocking_notifier_head libcfs_ioctl_list;
+static inline int notifier_from_ioctl_errno(int err)
+{
+       if (err == -EINVAL)
+               return NOTIFY_OK;
+       return notifier_from_errno(err) | NOTIFY_STOP_MASK;
+}
 
 /*
  * Defined by platform
@@ -112,22 +98,6 @@ unsigned int cfs_rand(void);
 /* seed the generator */
 void cfs_srand(unsigned int, unsigned int);
 void cfs_get_random_bytes(void *buf, int size);
-#endif /* __KERNEL__ */
-
-#include <libcfs/byteorder.h>
-#include <libcfs/libcfs_debug.h>
-#include <libcfs/libcfs_private.h>
-#ifdef __KERNEL__
-# include <libcfs/bitmap.h>
-# include <libcfs/libcfs_cpu.h>
-# include <libcfs/libcfs_ioctl.h>
-# include <libcfs/libcfs_prim.h>
-# include <libcfs/libcfs_time.h>
-# include <libcfs/libcfs_string.h>
-# include <libcfs/libcfs_workitem.h>
-# include <libcfs/libcfs_hash.h>
-# include <libcfs/libcfs_heap.h>
-# include <libcfs/libcfs_fail.h>
 
 int libcfs_ioctl_data_adjust(struct libcfs_ioctl_data *data);
 int libcfs_ioctl(unsigned long cmd, void __user *uparam);
@@ -141,9 +111,23 @@ static inline void *__container_of(const void *ptr, unsigned long shift)
                return (char *)ptr - shift;
 }
 
-#define container_of0(ptr, type, member)                               \
+#define container_of0(ptr, type, member) \
        ((type *)__container_of((ptr), offsetof(type, member)))
 
-#endif /* __KERNEL__ */
+extern struct workqueue_struct *cfs_rehash_wq;
+
+struct lnet_debugfs_symlink_def {
+       const char *name;
+       const char *target;
+};
+
+void lnet_insert_debugfs(struct ctl_table *table);
+void lnet_remove_debugfs(struct ctl_table *table);
+
+/* helper for sysctl handlers */
+int lprocfs_call_handler(void *data, int write, loff_t *ppos,
+                        void __user *buffer, size_t *lenp,
+                        int (*handler)(void *data, int write, loff_t pos,
+                                       void __user *buffer, int len));
 
 #endif /* _LIBCFS_LIBCFS_H_ */