X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Flinux%2Flibcfs.h;h=2ee0c0929886c5619b2dac93a554c75690b8b77f;hb=3f92a017ae2d97506db89b34c374bbcf9670db54;hp=dee91d9275a937e1e5aea5d6f69b68b25427a5a4;hpb=7de9e8dd313557997fb28f3926516b5c26d31c9a;p=fs%2Flustre-release.git

diff --git a/libcfs/include/libcfs/linux/libcfs.h b/libcfs/include/libcfs/linux/libcfs.h
index dee91d9..2ee0c09 100644
--- a/libcfs/include/libcfs/linux/libcfs.h
+++ b/libcfs/include/libcfs/linux/libcfs.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -47,6 +47,7 @@
 
 
 #include <stdarg.h>
+#include <libcfs/linux/linux-cpu.h>
 #include <libcfs/linux/linux-time.h>
 #include <libcfs/linux/linux-mem.h>
 #include <libcfs/linux/linux-prim.h>
@@ -54,7 +55,6 @@
 #include <libcfs/linux/linux-fs.h>
 #include <libcfs/linux/linux-tcpip.h>
 #include <libcfs/linux/linux-bitops.h>
-#include <libcfs/linux/linux-types.h>
 #include <libcfs/linux/kp30.h>
 
 #ifdef HAVE_ASM_TYPES_H
@@ -63,9 +63,8 @@
 #include <linux/types.h>
 #include <asm/timex.h>
 #include <linux/sched.h> /* THREAD_SIZE */
+#include <linux/rbtree.h>
 
-#define CFS_THREAD_SIZE   THREAD_SIZE
-#define LUSTRE_TRACE_SIZE (THREAD_SIZE >> 5)
 
 #if !defined(__x86_64__)
 # ifdef  __ia64__
@@ -81,9 +80,8 @@
 #define __CHECK_STACK(msgdata, mask, cdls)                              \
 do {                                                                    \
         if (unlikely(CDEBUG_STACK() > libcfs_stack)) {                  \
+                LIBCFS_DEBUG_MSG_DATA_INIT(msgdata, D_WARNING, NULL);   \
                 libcfs_stack = CDEBUG_STACK();                          \
-                (msgdata)->msg_mask = D_WARNING;                        \
-                (msgdata)->msg_cdls = NULL;                             \
                 libcfs_debug_msg(msgdata,                               \
                                  "maximum lustre stack %lu\n",          \
                                  CDEBUG_STACK());                       \
@@ -115,7 +113,6 @@ do {                                                                    \
 #define CFS_CURPROC_COMM_MAX (sizeof ((struct task_struct *)0)->comm)
 
 #include <linux/capability.h>
-typedef kernel_cap_t cfs_kernel_cap_t;
 
 /*
  * No stack-back-tracing in Linux for now.
@@ -131,38 +128,14 @@ typedef long long_ptr_t;
 #define WITH_WATCHDOG
 #endif
 
-#ifndef HAVE_STRUCT_CRED
-
-#define current_cred() (current)
-
-#define current_cred_xxx(xxx)                   \
-({                                              \
-        current->xxx;                     \
-})
-
-#ifndef HAVE_CRED_WRAPPERS
-
-#define current_uid()           (current_cred_xxx(uid))
-#define current_gid()           (current_cred_xxx(gid))
-#define current_euid()          (current_cred_xxx(euid))
-#define current_egid()          (current_cred_xxx(egid))
-#define current_suid()          (current_cred_xxx(suid))
-#define current_sgid()          (current_cred_xxx(sgid))
-#define current_fsuid()         (current_cred_xxx(fsuid))
-#define current_fsgid()         (current_cred_xxx(fsgid))
-#define current_cap()           (current_cred_xxx(cap_effective))
-
-#endif /* HAVE_LINUX_CRED_H */
-
-#define current_user()          (current_cred_xxx(user))
-#define current_user_ns()       (current_cred_xxx(user)->user_ns)
-#define current_security()      (current_cred_xxx(security))
-
-#define cred task_struct
-
-#define prepare_creds() (current)
-#define commit_creds(a)
+/*
+ * Macros to access common characteristics of "current" UNIX process.
+ */
+#define current_pid()             (current->pid)
+#define current_umask()           (current->fs->umask)
+#define current_comm()            (current->comm)
 
-#endif /* HAVE_STRUCT_CRED */
+/* check if task is running in compat mode.*/
+int current_is_32bit(void);
 
 #endif /* _LINUX_LIBCFS_H */