I touched one thing in lustre_mds.h, and I was dismayed to see the

entire source tree rebuild!

It took just a few minutes to remove a number of #includes which
violated all manner of abstraction boundary.  ericm assures me that I
have not broken anything major in liblustre.

Also, I moved a good chunk of inline functions into llite_internal.h
(which is where I secretly believe that most of lustre_lite.h will end up),
and renamed ll_ino2fid (which no longer takes an inode) to mdc_pack_fid.

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index 70b4b6a..91e6a77 100644 (file)
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -31,11 +31,10 @@
 # include <linux/init.h>
 #else
 # include <liblustre.h>
-# include <linux/obd_class.h>
 #endif
 
+#include <linux/obd_class.h>
 #include <linux/lustre_mds.h>
-#include <linux/lustre_lite.h>
 #include <linux/lustre_dlm.h>
 #include <linux/lprocfs_status.h>
 #include "mdc_internal.h"

diff --git a/lustre/obdclass/llog_test.c b/lustre/obdclass/llog_test.c
index 4b1dfbb..319f777 100644 (file)
--- a/lustre/obdclass/llog_test.c
+++ b/lustre/obdclass/llog_test.c
@@ -32,6 +32,7 @@
 
 #include <linux/obd_class.h>
 #include <linux/lustre_log.h>
+#include <linux/lustre_mds.h> /* for LUSTRE_MDC_NAME */
 
 static int llog_test_rand;
 static struct obd_uuid uuid = { .uuid = "test_uuid" };

diff --git a/lustre/obdclass/obd_config.c b/lustre/obdclass/obd_config.c
index e52effc..d8e21be 100644 (file)
--- a/lustre/obdclass/obd_config.c
+++ b/lustre/obdclass/obd_config.c
@@ -35,6 +35,7 @@
 #include <linux/obd_class.h>
 #include <linux/obd.h>
 #endif
+#include <linux/lustre_log.h>
 #include <linux/lprocfs_status.h>
 #include <portals/list.h>