X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Fcurproc.h;h=0f00c7219e75dc6933785ad2218edc4a0939d885;hp=178c0baa0acfaa4f765c331db7e41379607604ee;hb=cda0a8abf5bbfe0f3fc12454c1d3d8efdcbda17c;hpb=d39408943a56f452d68b3c8b170ee4ce10e416fa

diff --git a/libcfs/include/libcfs/curproc.h b/libcfs/include/libcfs/curproc.h
index 178c0ba..0f00c72 100644
--- a/libcfs/include/libcfs/curproc.h
+++ b/libcfs/include/libcfs/curproc.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) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -43,77 +39,9 @@
 #ifndef __LIBCFS_CURPROC_H__
 #define __LIBCFS_CURPROC_H__
 
-#if !defined(HAVE_UIDGID_HEADER) || !defined(__KERNEL__)
-
-#ifndef _LINUX_UIDGID_H
-#define _LINUX_UIDGID_H
-
-typedef uid_t kuid_t;
-typedef gid_t kgid_t;
-
-#define INVALID_UID	-1
-#define INVALID_GID	-1
-
-#define GLOBAL_ROOT_UID	 0
-#define GLOBAL_ROOT_GID	 0
-
-#ifndef __KERNEL__
-struct user_namespace {
-	unsigned int pad;
-};
-
-extern struct user_namespace init_user_ns;
-#endif
-
-static inline uid_t __kuid_val(kuid_t uid)
-{
-	return uid;
-}
-
-static inline gid_t __kgid_val(kgid_t gid)
-{
-	return gid;
-}
-
-static inline kuid_t make_kuid(struct user_namespace *from, uid_t uid)
-{
-	return uid;
-}
-
-static inline kgid_t make_kgid(struct user_namespace *from, gid_t gid)
-{
-	return gid;
-}
-
-static inline uid_t from_kuid(struct user_namespace *to, kuid_t uid)
-{
-	return uid;
-}
-
-static inline gid_t from_kgid(struct user_namespace *to, kgid_t gid)
-{
-	return gid;
-}
-
-static inline bool uid_eq(kuid_t left, kuid_t right)
-{
-	return left == right;
-}
-
-static inline bool uid_valid(kuid_t uid)
-{
-	return uid != (typeof(uid))INVALID_UID;
-}
-
-static inline bool gid_valid(kgid_t gid)
-{
-	return gid != (typeof(gid))INVALID_GID;
-}
-#endif /* _LINUX_UIDGID_H */
-
-#endif
-
-int cfs_get_environ(const char *key, char *value, int *val_len);
+/* check if task is running in compat mode.*/
+#define current_pid()		(current->pid)
+#define current_comm()		(current->comm)
 
 typedef __u32 cfs_cap_t;