staging/lustre: remove lvfs_linux.h

[deliverable/linux.git] / drivers / staging / lustre / lustre / include / linux / lvfs.h

diff --git a/drivers/staging/lustre/lustre/include/linux/lvfs.h b/drivers/staging/lustre/lustre/include/linux/lvfs.h
index dd1be9c3982904dd46d5887d366b27f1f78d2dcb..ddeb7de9bf016061582be2e5790905008f357233 100644 (file)
--- a/drivers/staging/lustre/lustre/include/linux/lvfs.h
+++ b/drivers/staging/lustre/lustre/include/linux/lvfs.h
@@ -45,9 +45,10 @@
 #error Do not #include this file directly. #include <lvfs.h> instead
 #endif
 
+#include <linux/kernel.h>
+#include <linux/fs.h>
+#include <linux/sched.h>
 #include "lustre_compat25.h"
-#include "lustre_common.h"
-#include "lvfs_linux.h"
 
 #define LLOG_LVFS
 
@@ -87,7 +88,7 @@ struct lvfs_run_ctxt {
 #ifdef OBD_CTXT_DEBUG
 #define OBD_SET_CTXT_MAGIC(ctxt) (ctxt)->magic = OBD_RUN_CTXT_MAGIC
 #else
-#define OBD_SET_CTXT_MAGIC(ctxt) do {} while(0)
+#define OBD_SET_CTXT_MAGIC(ctxt) do {} while (0)
 #endif