LU-4423 libcfs: Merge linux-proc.c into module.c

[fs/lustre-release.git] / libcfs / include / libcfs / curproc.h

diff --git a/libcfs/include/libcfs/curproc.h b/libcfs/include/libcfs/curproc.h
index aa144e7..6568ccb 100644 (file)
--- a/libcfs/include/libcfs/curproc.h
+++ b/libcfs/include/libcfs/curproc.h
@@ -27,7 +27,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,7 +43,7 @@
 #ifndef __LIBCFS_CURPROC_H__
 #define __LIBCFS_CURPROC_H__
 
-#if !defined(HAVE_UIDGID_HEADER) || !defined(__KERNEL__)
+#ifndef HAVE_UIDGID_HEADER
 
 #ifndef _LINUX_UIDGID_H
 #define _LINUX_UIDGID_H
@@ -51,20 +51,12 @@
 typedef uid_t kuid_t;
 typedef gid_t kgid_t;
 
-#define INVALID_UID     -1
-#define INVALID_GID     -1
+#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;
@@ -102,12 +94,12 @@ static inline bool uid_eq(kuid_t left, kuid_t right)
 
 static inline bool uid_valid(kuid_t uid)
 {
-       return (uid != INVALID_UID);
+       return uid != (typeof(uid))INVALID_UID;
 }
 
 static inline bool gid_valid(kgid_t gid)
 {
-       return (gid != INVALID_GID);
+       return gid != (typeof(gid))INVALID_GID;
 }
 #endif /* _LINUX_UIDGID_H */