b=24037 Changes of 2.6.32 kernel.

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

diff --git a/lustre/liblustre/lutil.c b/lustre/liblustre/lutil.c
index 0de50cf..dead71b 100644 (file)
--- a/lustre/liblustre/lutil.c
+++ b/lustre/liblustre/lutil.c
@@ -26,7 +26,7 @@
  * 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.
  */
 /*
@@ -77,14 +77,14 @@ void *inter_module_get(char *arg)
                 return ldlm_namespace_cleanup;
         else if (!strcmp(arg, "ldlm_replay_locks"))
                 return ldlm_replay_locks;
-#ifdef HAVE_QUOTA_SUPPORT
-        else if (!strcmp(arg, "osc_quota_interface"))
-                return &osc_quota_interface;
         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;
-#endif
         else
                 return NULL;
 }
@@ -128,7 +128,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 +142,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)
@@ -181,7 +182,7 @@ static void init_capability(__u32 *res)
 #endif
 }
 
-int in_group_p(gid_t gid)
+int cfs_curproc_is_in_groups(gid_t gid)
 {
         int i;