Backout "liblustre now builds" commit. It breaks building in utils:

[fs/lustre-release.git] / lustre / include / linux / lvfs.h

diff --git a/lustre/include/linux/lvfs.h b/lustre/include/linux/lvfs.h
index 0fc302f..4c3c8e1 100644 (file)
--- a/lustre/include/linux/lvfs.h
+++ b/lustre/include/linux/lvfs.h
@@ -35,8 +35,10 @@
 #include <linux/namei.h>
 #include <linux/lustre_compat25.h>
 #include <linux/lvfs_linux.h>
-#else
-#include <liblustre.h>
+#endif
+
+#ifdef LIBLUSTRE
+#include <lvfs_user_fs.h>
 #endif
 
 struct mds_grp_hash_entry;