X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fliblustre%2Flutil.c;h=ba1c35ba2f34e6ed1b265a9f420df54a07c231e5;hb=f3864905b26a90ed3a9bb6f99357264fa40015c4;hp=d2752e1db6b1c159ca1730c9592e719bee6d9099;hpb=6e3ec5812ebd1b5ecf7cae584f429b013ffe7431;p=fs%2Flustre-release.git

diff --git a/lustre/liblustre/lutil.c b/lustre/liblustre/lutil.c
index d2752e1..ba1c35b 100644
--- 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,68 +24,37 @@
  * 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/
  * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <signal.h>
-#include <sys/types.h>
-
+#include <byteswap.h>
+#include <errno.h>
 #include <fcntl.h>
-#ifdef HAVE_NETDB_H
+#include <malloc.h>
 #include <netdb.h>
-#endif
-#ifdef _AIX
-#include "syscall_AIX.h"
-#else
+#include <stdio.h>
+#include <unistd.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
 #include <sys/syscall.h>
-#endif
+#include <sys/time.h>
+#include <sys/types.h>
 #include <sys/utsname.h>
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#include <sys/socket.h>
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_CATAMOUNT_DATA_H
-#include <catamount/data.h>
-#endif
-
+#include <libcfs/libcfs.h>
+#include <lustre/lustre_idl.h>
+#include <liblustre.h>
+#include <lnet/lnet.h>
+#include <lustre_dlm.h>
 #include "lutil.h"
 
-
-unsigned int libcfs_subsystem_debug = ~0 - (S_LNET | S_LND);
-unsigned int libcfs_debug = 0;
-
-struct task_struct     *current;
-
-void *inter_module_get(char *arg)
-{
-        if (!strcmp(arg, "ldlm_cli_cancel_unused"))
-                return ldlm_cli_cancel_unused;
-        else if (!strcmp(arg, "ldlm_namespace_cleanup"))
-                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;
-}
+struct task_struct *current;
 
 /*
  * random number generator stuff
@@ -128,7 +95,7 @@ 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;
                 }
@@ -142,7 +109,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)
@@ -182,7 +149,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;
 
@@ -210,7 +177,6 @@ int liblustre_init_current(char *comm)
         current->gid = getgid();
         current->fsuid = geteuid();
         current->fsgid = getegid();
-        memset(&current->pending, 0, sizeof(current->pending));
 
         current->max_groups = sysconf(_SC_NGROUPS_MAX);
         current->groups = malloc(sizeof(gid_t) * current->max_groups);
@@ -245,11 +211,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)