X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Fcurproc.h;h=aa144e70de6bedcaa2510f026f4172663cccc6a1;hb=5655ee76f5c7573c9ad076a92df6388f27b65196;hp=7d75c6f6d08d6d54897140d38c853af122640d31;hpb=26008f505c57a7affa4d12b542d3d5a790d7e69a;p=fs%2Flustre-release.git

diff --git a/libcfs/include/libcfs/curproc.h b/libcfs/include/libcfs/curproc.h
index 7d75c6f..aa144e7 100644
--- a/libcfs/include/libcfs/curproc.h
+++ b/libcfs/include/libcfs/curproc.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.
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * 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/
@@ -43,40 +43,78 @@
 #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_uid(void);
-gid_t  cfs_curproc_gid(void);
-uid_t  cfs_curproc_euid(void);
-gid_t  cfs_curproc_egid(void);
-uid_t  cfs_curproc_fsuid(void);
-gid_t  cfs_curproc_fsgid(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__)
 
+#ifndef _LINUX_UIDGID_H
+#define _LINUX_UIDGID_H
 
-/*
- * Plus, platform-specific constant
- *
- * CFS_CURPROC_COMM_MAX,
- *
- * and opaque scalar type
- *
- * cfs_kernel_cap_t
- */
+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
 
-/* check if task is running in compat mode.*/
-int cfs_curproc_is_32bit(void);
+#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 != INVALID_UID);
+}
+
+static inline bool gid_valid(kgid_t gid)
+{
+	return (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;
 
 #define CFS_CAP_CHOWN                   0