merge b_devel into b_setattr. highlights:

- kernel 2.5 and liblustre build changes
- fixes to Makefile.am for 7.3-era versions of automake, which is quite possibly
  the worst piece of software with which I come in contact on a daily basis
- small unlink fix

diff --git a/lustre/tests/statmany.c b/lustre/tests/statmany.c
index f6370e3..edfa47b 100644 (file)
--- a/lustre/tests/statmany.c
+++ b/lustre/tests/statmany.c
@@ -14,6 +14,7 @@
 #if 0
 #include <linux/extN_fs.h>
 #endif
+#include <liblustre.h>
 #include <linux/lustre_lib.h>
 #include <linux/obd.h>
 

diff --git a/lustre/tests/wantedi.c b/lustre/tests/wantedi.c
index 426602f..94ed749 100644 (file)
--- a/lustre/tests/wantedi.c
+++ b/lustre/tests/wantedi.c
@@ -10,8 +10,9 @@
 #include <time.h>
 #include <limits.h>
 #include <sys/ioctl.h>
-#include <linux/lustre_lib.h>
+#include <liblustre.h>
 #include <linux/obd.h>
+#include <linux/lustre_lib.h>
 
 static int usage(char *prog, FILE *out)
 {