Synced up the intent locking branch with the head

New on branch:
 - Substantial updates to documentation: intro, howto, debugging
 - Beginning of further intent handling for getattr/setattr

diff --git a/lustre/tests/test.c b/lustre/tests/test.c
index b941d78..d4c6bf7 100755 (executable)
--- a/lustre/tests/test.c
+++ b/lustre/tests/test.c
@@ -13,12 +13,7 @@
 #include <sys/stat.h>
 #include <asm/statfs.h>
 #include <unistd.h>
-
-#define OBD_IOC_CREATE                 _IOR('f', 3, long)
-#define OBD_IOC_SETUP                  _IOW('f', 4, long)
-#define OBD_IOC_SYNC                   _IOR('f', 16, long)
-#define OBD_IOC_DESTROY                _IOW('f', 6, long)
-#define OBD_IOC_STATFS                _IORW('f', 15, long)
+#include <linux/lustre_idl.h>
 
 #define LOOP_DEVICE "/dev/loop0"
 #define OBD_DEVICE "/dev/obd"