b=22244 ldlm cancel flags cleanup

[fs/lustre-release.git] / lustre / lvfs / prng.c

diff --git a/lustre/lvfs/prng.c b/lustre/lvfs/prng.c
index b067338..193fc8e 100644 (file)
--- a/lustre/lvfs/prng.c
+++ b/lustre/lvfs/prng.c
@@ -1,24 +1,58 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- *   This file is part of the Lustre file system, http://www.lustre.org
- *   Lustre is a trademark of Cluster File Systems, Inc.
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/lvfs/prng.c
  *
  * concatenation of following two 16-bit multiply with carry generators
  * x(n)=a*x(n-1)+carry mod 2^16 and y(n)=b*y(n-1)+carry mod 2^16,
  * number and carry packed within the same 32 bit integer.
  * algorithm recommended by Marsaglia
- ******************************************************************/
+*/
+
 #ifndef EXPORT_SYMTAB
 # define EXPORT_SYMTAB
 #endif
 
 #ifndef __KERNEL__
 #include <liblustre.h>
-#define get_random_bytes(val, size)     (*val) = 0
+#define cfs_get_random_bytes(val, size)     (*val) = 0
 #endif
 #include <obd_class.h>
+#if defined(HAVE_LINUX_RANDOM_H)
 #include <linux/random.h>
+#endif
 
 /*
 From: George Marsaglia <geo@stat.fsu.edu>
@@ -78,7 +112,7 @@ void ll_get_random_bytes(void *buf, int size)
 
         rem = min((int)((unsigned long)buf & (sizeof(int) - 1)), size);
         if (rem) {
-                get_random_bytes(&tmp, sizeof(tmp));
+                cfs_get_random_bytes(&tmp, sizeof(tmp));
                 tmp ^= ll_rand();
                 memcpy(buf, &tmp, rem);
                 p = buf + rem;
@@ -86,14 +120,14 @@ void ll_get_random_bytes(void *buf, int size)
         }
 
         while (size >= sizeof(int)) {
-                get_random_bytes(&tmp, sizeof(tmp));
+                cfs_get_random_bytes(&tmp, sizeof(tmp));
                 *p = ll_rand() ^ tmp;
                 size -= sizeof(int);
                 p++;
         }
         buf = p;
         if (size) {
-                get_random_bytes(&tmp, sizeof(tmp));
+                cfs_get_random_bytes(&tmp, sizeof(tmp));
                 tmp ^= ll_rand();
                 memcpy(buf, &tmp, size);
         }
@@ -105,4 +139,3 @@ void ll_generate_random_uuid(class_uuid_t uuid_out)
         ll_get_random_bytes(uuid_out, sizeof(class_uuid_t));
 }
 EXPORT_SYMBOL(ll_generate_random_uuid);
-