LU-5557 mdt: track reint operations in MDS service stats

[fs/lustre-release.git] / libcfs / libcfs / user-prim.c

diff --git a/libcfs/libcfs/user-prim.c b/libcfs/libcfs/user-prim.c
index 80bec14..2066499 100644 (file)
--- a/libcfs/libcfs/user-prim.c
+++ b/libcfs/libcfs/user-prim.c
@@ -168,12 +168,12 @@ void cond_resched(void)
 
 void cfs_init_timer(struct timer_list *t)
 {
-       CFS_INIT_LIST_HEAD(&t->tl_list);
+       INIT_LIST_HEAD(&t->tl_list);
 }
 
 void cfs_timer_init(struct timer_list *l, cfs_timer_func_t *func, void *arg)
 {
-       CFS_INIT_LIST_HEAD(&l->tl_list);
+       INIT_LIST_HEAD(&l->tl_list);
        l->function = func;
        l->data = (ulong_ptr_t)arg;
        return;
@@ -245,6 +245,9 @@ void *kthread_run(cfs_thread_t func, void *arg, const char namefmt[], ...)
 }
 #endif
 
+struct user_namespace init_user_ns __read_mostly;
+EXPORT_SYMBOL(init_user_ns);
+
 uid_t current_uid(void)
 {
         return getuid();
@@ -265,32 +268,6 @@ gid_t current_fsgid(void)
         return getgid();
 }
 
-#ifndef HAVE_STRLCPY /* not in glibc for RHEL 5.x, remove when obsolete */
-size_t strlcpy(char *tgt, const char *src, size_t tgt_len)
-{
-       int src_len = strlen(src);
-
-       strncpy(tgt, src, tgt_len - 1);
-       tgt[tgt_len - 1] = '\0';
-
-       return src_len + 1;
-}
-#endif
-
-#ifndef HAVE_STRLCAT /* not in glibc for RHEL 5.x, remove when obsolete */
-size_t strlcat(char *tgt, const char *src, size_t size)
-{
-       size_t tgt_len = strlen(tgt);
-
-       if (size > tgt_len) {
-               strncat(tgt, src, size - tgt_len - 1);
-               tgt[size - 1] = '\0';
-       }
-
-       return tgt_len + strlen(src);
-}
-#endif
-
 /* Read the environment variable of current process specified by @key. */
 int cfs_get_environ(const char *key, char *value, int *val_len)
 {
@@ -385,7 +362,6 @@ void cfs_clear_sigpending(void)
         return;
 }
 
-#ifdef __linux__
 
 /*
  * In glibc (NOT in Linux, so check above is not right), implement
@@ -406,17 +382,6 @@ void *cfs_stack_trace_frame(struct cfs_stack_trace *trace, int frame_no)
                 return NULL;
 }
 
-#else
-
-void cfs_stack_trace_fill(struct cfs_stack_trace *trace)
-{}
-void *cfs_stack_trace_frame(struct cfs_stack_trace *trace, int frame_no)
-{
-        return NULL;
-}
-
-/* __linux__ */
-#endif
 
 void lbug_with_loc(struct libcfs_debug_msg_data *msgdata)
 {