- merge b_devel into b_proto (incl b_swab changes)

- fix leak-all-bulk-pages bug
- Mike fixed a bug where a failed ptlrpc_queue_wait send buf would
  fail, but the user would still have to wait for the timeout to pass
  before being able to interrupt

diff --git a/lustre/obdclass/uuid.c b/lustre/obdclass/uuid.c
index fed9a8f..dec9a4f 100644 (file)
--- a/lustre/obdclass/uuid.c
+++ b/lustre/obdclass/uuid.c
@@ -15,13 +15,14 @@
 #ifdef __KERNEL__
 #include <linux/ctype.h>
 #include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/smp_lock.h>
 #else 
 #include <liblustre.h>
 #endif
 
 #include <linux/obd_support.h>
 #include <linux/obd_class.h>
-#include <linux/smp_lock.h>
 
 struct uuid {
        __u32   time_low;