From: walter <walter>
Date: Wed, 26 Sep 2007 21:00:47 +0000 (+0000)
Subject: bz-13541
X-Git-Tag: v1_8_0_110~1165
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=53cedecb9c53158fa2fcd7047b1b9505a179177e;p=fs%2Flustre-release.git

bz-13541
---

diff --git a/lustre/lvfs/lvfs_lib.c b/lustre/lvfs/lvfs_lib.c
index 55e4e6f..a89f972 100644
--- a/lustre/lvfs/lvfs_lib.c
+++ b/lustre/lvfs/lvfs_lib.c
@@ -35,8 +35,8 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 {
         if (ptr == NULL ||
             (ll_rand() & OBD_ALLOC_FAIL_MASK) < obd_alloc_fail_rate) {
-                CERROR("%s%salloc of %s (%u bytes) failed at %s:%d\n",
-                       ptr ? "force " :"", type, name, (unsigned int)size, file,
+                CERROR("%s%salloc of %s ("LPU64" bytes) failed at %s:%d\n",
+                       ptr ? "force " :"", type, name, (__u64) size, file,
                        line);
                 CERROR("%d total bytes allocated by Lustre, %d by Portals\n",
                        atomic_read(&obd_memory), atomic_read(&libcfs_kmemory));
diff --git a/lustre/lvfs/prng.c b/lustre/lvfs/prng.c
index 4922c04..1c926f4 100644
--- a/lustre/lvfs/prng.c
+++ b/lustre/lvfs/prng.c
@@ -16,9 +16,11 @@
 #ifndef __KERNEL__
 #include <liblustre.h>
 #define get_random_bytes(val, size)     (*val) = 0
-#endif
-#include <obd_class.h>
+#else /* __KERNEL__ */
 #include <linux/random.h>
+#endif /* __KERNEL__ */
+
+#include <obd_class.h>
 
 /*
 From: George Marsaglia <geo@stat.fsu.edu>