From: phil <phil>
Date: Fri, 25 Jul 2003 21:56:16 +0000 (+0000)
Subject: merge b_devel into b_filterio
X-Git-Tag: v1_7_110~1^13~165
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=c5eba0df17068974e77716e1d11a40021f1cddb8;p=fs%2Flustre-release.git

merge b_devel into b_filterio
---

diff --git a/lustre/obdclass/Makefile.mk b/lustre/obdclass/Makefile.mk
index d29a216..6183751 100644
--- a/lustre/obdclass/Makefile.mk
+++ b/lustre/obdclass/Makefile.mk
@@ -8,7 +8,7 @@ include $(src)/../portals/Kernelenv
 obj-y += obdclass.o fsfilt_ext3.o
 obdclass-objs := class_obd.o debug.o genops.o sysctl.o uuid.o simple.o\
 		lprocfs_status.o lustre_handles.o lustre_peer.o fsfilt.o \
-		statfs_pack.o recov_log.o otree.o
+		statfs_pack.o recov_log.o otree.o obdo.o
 
 $(obj)/class_obd.o: lustre_build_version
 
diff --git a/lustre/tests/Makefile.mk b/lustre/tests/Makefile.mk
index 6eec366..3b4dda3 100644
--- a/lustre/tests/Makefile.mk
+++ b/lustre/tests/Makefile.mk
@@ -11,7 +11,7 @@ host-progs := openunlink testreq truncate directio openme writeme open_delay \
 		stat createmany statmany multifstat createtest mlink \
 		opendirunlink opendevunlink unlinkmany fchdir_test \
 		checkstat wantedi statone runas openfile \
-		mcreate mkdirmany utime o_directory
+		mcreate mkdirmany utime o_directory small_write
 
 always := $(host-progs) 
 
@@ -49,3 +49,4 @@ opendevunlink-objs :=opendirunlink.o
 fchdir_test-objs :=fchdir_test.o
 utime-objs :=utime.o
 o_directory-objs :=o_directory.o
+small_write-objs :=small_write.o