Merge from posix_stable branch.

diff --git a/lustre/include/linux/lustre_idl.h b/lustre/include/linux/lustre_idl.h
index be8348f..c4d5e3d 100644 (file)
--- a/lustre/include/linux/lustre_idl.h
+++ b/lustre/include/linux/lustre_idl.h
@@ -28,6 +28,7 @@
 # include <linux/ioctl.h>
 # include <asm/types.h>
 # include <linux/types.h>
+# include <linux/list.h>
 #else
 # define __KERNEL__
 # include <linux/list.h>
@@ -153,6 +154,19 @@ struct obdo {
 #define OBD_MD_FLNOTOBD (~(OBD_MD_FLOBDMD | OBD_MD_FLOBDFLG | OBD_MD_FLBLOCKS |\
                            OBD_MD_LINKNAME))
 
+struct obd_statfs {
+        __u64           os_type;
+        __u64           os_blocks;
+        __u64           os_bfree;
+        __u64           os_bavail;
+        __u64           os_files;
+        __u64           os_ffree;
+        __u64           os_fsid;
+        __u32           os_bsize;
+        __u32           os_namelen;
+        __u32           os_spare[12];
+};
+
 struct obd_ioobj {
         obd_id    ioo_id;
         obd_gr    ioo_gr;