b=13541

Reverting broken commit.

diff --git a/lustre/lvfs/lvfs_lib.c b/lustre/lvfs/lvfs_lib.c
index a89f972..55e4e6f 100644 (file)
--- 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 ("LPU64" bytes) failed at %s:%d\n",
-                       ptr ? "force " :"", type, name, (__u64) size, file,
+                CERROR("%s%salloc of %s (%u bytes) failed at %s:%d\n",
+                       ptr ? "force " :"", type, name, (unsigned int)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 1c926f4..4922c04 100644 (file)
--- a/lustre/lvfs/prng.c
+++ b/lustre/lvfs/prng.c
@@ -16,11 +16,9 @@
 #ifndef __KERNEL__
 #include <liblustre.h>
 #define get_random_bytes(val, size)     (*val) = 0
-#else /* __KERNEL__ */
-#include <linux/random.h>
-#endif /* __KERNEL__ */
-
+#endif
 #include <obd_class.h>
+#include <linux/random.h>
 
 /*
 From: George Marsaglia <geo@stat.fsu.edu>