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 fc9bc5d..2ec4aa2 100644 (file)
--- a/lustre/liblustre/lutil.c
+++ b/lustre/liblustre/lutil.c
@@ -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) 2004, 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/
@@ -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;
 
@@ -77,14 +72,6 @@ void *inter_module_get(char *arg)
                 return ldlm_namespace_cleanup;
         else if (!strcmp(arg, "ldlm_replay_locks"))
                 return ldlm_replay_locks;
-        else if (!strcmp(arg, "mdc_quota_interface"))
-                return &mdc_quota_interface;
-        else if (!strcmp(arg, "lmv_quota_interface"))
-                return &lmv_quota_interface;
-        else if (!strcmp(arg, "osc_quota_interface"))
-                return &osc_quota_interface;
-        else if (!strcmp(arg, "lov_quota_interface"))
-                return &lov_quota_interface;
         else
                 return NULL;
 }
@@ -128,7 +115,8 @@ void liblustre_init_random()
         if (_rand_dev_fd >= 0) {
                 if (syscall(SYS_read, _rand_dev_fd,
                             &seed, sizeof(seed)) == sizeof(seed)) {
-                        ll_srand(seed[0], seed[1]);
+                        cfs_srand(seed[0], seed[1]);
+                        syscall(SYS_close, _rand_dev_fd);
                         return;
                 }
                 syscall(SYS_close, _rand_dev_fd);
@@ -141,7 +129,7 @@ void liblustre_init_random()
         seed[0] = _my_pnid;
 #endif
         gettimeofday(&tv, NULL);
-        ll_srand(tv.tv_sec ^ __swab32(seed[0]), tv.tv_usec ^__swab32(getpid()));
+        cfs_srand(tv.tv_sec ^ __swab32(seed[0]), tv.tv_usec ^__swab32(getpid()));
 }
 
 static void init_capability(__u32 *res)
@@ -244,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)