From: pschwan <pschwan>
Date: Sat, 12 Apr 2003 20:07:22 +0000 (+0000)
Subject: - merge b_devel into b_proto (incl b_swab changes)
X-Git-Tag: v1_7_100~1^391~23
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=17de2ec49fe1cb9024aa54d154dca54294495f80;p=fs%2Flustre-release.git

- 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
--- 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;