LU-3321 clio: revert LU-2622 for removing global env list

[fs/lustre-release.git] / lustre / liblustre / lutil.c

diff --git a/lustre/liblustre/lutil.c b/lustre/liblustre/lutil.c
index add67f3..2ec4aa2 100644 (file)
--- a/lustre/liblustre/lutil.c
+++ b/lustre/liblustre/lutil.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -57,15 +57,10 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
-#ifdef HAVE_CATAMOUNT_DATA_H
-#include <catamount/data.h>
-#endif
 
 #include "lutil.h"
 
 
-unsigned int libcfs_subsystem_debug = ~0 - (S_LNET | S_LND);
-unsigned int libcfs_debug = 0;
 
 struct task_struct     *current;
 
@@ -174,7 +169,7 @@ static void init_capability(__u32 *res)
 #endif
 }
 
-int cfs_curproc_is_in_groups(gid_t gid)
+int in_group_p(gid_t gid)
 {
         int i;
 
@@ -237,11 +232,11 @@ int cfs_cap_raised(cfs_cap_t cap)
 }
 
 cfs_cap_t cfs_curproc_cap_pack(void) {
-        return cfs_current()->cap_effective;
+       return current->cap_effective;
 }
 
 void cfs_curproc_cap_unpack(cfs_cap_t cap) {
-        cfs_current()->cap_effective = cap;
+       current->cap_effective = cap;
 }
 
 int cfs_capable(cfs_cap_t cap)