From: pschwan <pschwan>
Date: Mon, 17 Feb 2003 18:44:21 +0000 (+0000)
Subject: merge b_devel into b_setattr.  highlights:
X-Git-Tag: v1_7_110~2^11~188
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=24299288cbc52aa999daa394d0f6f2a07800cac2;p=fs%2Flustre-release.git

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
--- 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..94ed7495 100644
--- 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)
 {