get b_ad compiling after the b_devel merge.

- move the possibly broken waitfor_one_page to one place
- o_mtime is seconds, that's what ll_ts2u64 returns.  s/%Lu/LPU64/
- get rid of client_tgt2uuid2obd copies, export it from obdclass
- move client_obd_{setup,cleanup} into obdclass, export, kill dupes
- remove empty ptlrpc_lib
- get rid of random sanobd dupe in lov
- hoist ll_alloc_brw out of a kernel version ifdef
- no, seriously, unsigned long flags.

diff --git a/lustre/Makefile.mk b/lustre/Makefile.mk
index 34c2162..5acf3f6 100644 (file)
--- a/lustre/Makefile.mk
+++ b/lustre/Makefile.mk
@@ -6,7 +6,6 @@ LINUX = @LINUX@
 obj-y += portals/
 # obdclass has to come before anything that does class_register..
 obj-y += obdclass/
-obj-y += lib/
 obj-y += ptlrpc/
 obj-y += ldlm/
 obj-y += obdfilter/

diff --git a/lustre/mds/Makefile.mk b/lustre/mds/Makefile.mk
index 8d2a40e..0696bd7 100644 (file)
--- a/lustre/mds/Makefile.mk
+++ b/lustre/mds/Makefile.mk
@@ -6,4 +6,6 @@
 include $(src)/../portals/Kernelenv
 
 obj-y += mds.o
-mds-objs := mds_lov.o handler.o mds_reint.o mds_fs.o lproc_mds.o mds_open.o
+mds-objs := mds_lov.o handler.o mds_reint.o mds_fs.o lproc_mds.o mds_open.o \
+               mds_lib.o
+