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

diff --git a/libcfs/include/libcfs/curproc.h b/libcfs/include/libcfs/curproc.h
index e8ac036..178c0ba 100644
--- a/libcfs/include/libcfs/curproc.h
+++ b/libcfs/include/libcfs/curproc.h
@@ -43,35 +43,76 @@
 #ifndef __LIBCFS_CURPROC_H__
 #define __LIBCFS_CURPROC_H__
 
-#ifdef __KERNEL__
-/*
- * Portable API to access common characteristics of "current" UNIX process.
- *
- * Implemented in portals/include/libcfs/<os>/
- */
-uid_t  cfs_curproc_euid(void);
-gid_t  cfs_curproc_egid(void);
-pid_t  cfs_curproc_pid(void);
-int    cfs_curproc_groups_nr(void);
-int    cfs_curproc_is_in_groups(gid_t group);
-void   cfs_curproc_groups_dump(gid_t *array, int size);
-mode_t cfs_curproc_umask(void);
-char  *cfs_curproc_comm(void);
+#if !defined(HAVE_UIDGID_HEADER) || !defined(__KERNEL__)
 
-/*
- * Plus, platform-specific constant
- *
- * CFS_CURPROC_COMM_MAX,
- *
- * and opaque scalar type
- *
- * kernel_cap_t
- */
+#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
-uid_t  cfs_curproc_uid(void);
-gid_t  cfs_curproc_gid(void);
-uid_t  cfs_curproc_fsuid(void);
-gid_t  cfs_curproc_fsgid(void);
+
+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);
 
 typedef __u32 cfs_cap_t;