Branch b1_4_mountconf

b=8007
get rid of unneeded lustre_mgs.h

diff --git a/lustre/include/linux/lustre_mgs.h b/lustre/include/linux/lustre_mgs.h
deleted file mode 100644 (file)
index e9638a6..0000000
--- a/lustre/include/linux/lustre_mgs.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- *   This file is part of Lustre, http://www.lustre.org
- *
- * MGS data structures.
- * See also lustre_idl.h for wire formats of requests.
- */
-
-#ifndef _LUSTRE_MGS_H
-#define _LUSTRE_MGS_H
-
-#ifdef __KERNEL__
-# include <linux/fs.h>
-# include <linux/dcache.h>
-#endif
-#include <linux/lustre_handles.h>
-#include <libcfs/kp30.h>
-#include <linux/lustre_idl.h>
-#include <linux/lustre_lib.h>
-#include <linux/lustre_dlm.h>
-#include <linux/lustre_log.h>
-#include <linux/lustre_export.h>
-
-#define FSDB_EMPTY 0x0001
-
-struct fs_db {
-        char              fsdb_name[8];
-        struct list_head  fsdb_list;
-        struct semaphore  fsdb_sem;
-        void*             fsdb_ost_index_map;
-        void*             fsdb_mdt_index_map;
-        __u32             fsdb_flags;
-        __u32             fsdb_gen;
-};
-
-int mgs_fs_setup(struct obd_device *obd, struct vfsmount *mnt);
-int mgs_fs_cleanup(struct obd_device *obddev);
-int mgs_iocontrol(unsigned int cmd, struct obd_export *exp, 
-                  int len, void *karg, void *uarg);
-
-#endif

diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c
index 463eaca..8cd9bab 100644 (file)
--- a/lustre/mgc/mgc_request.c
+++ b/lustre/mgc/mgc_request.c
@@ -48,7 +48,6 @@
 #include <linux/lustre_log.h>
 #include <linux/lustre_fsfilt.h>
 #include <linux/lustre_disk.h>
-#include <linux/lustre_mgs.h>
 
 
 int mgc_logname2resid(char *logname, struct ldlm_res_id *res_id)

diff --git a/lustre/mgs/mgs_fs.c b/lustre/mgs/mgs_fs.c
index db0b5f7..868db40 100644 (file)
--- a/lustre/mgs/mgs_fs.c
+++ b/lustre/mgs/mgs_fs.c
@@ -35,7 +35,6 @@
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
 #include <linux/mount.h>
 #endif
-#include <linux/lustre_mgs.h>
 #include <linux/obd_class.h>
 #include <linux/obd_support.h>
 #include <linux/lustre_disk.h>

diff --git a/lustre/mgs/mgs_internal.h b/lustre/mgs/mgs_internal.h
index 79e8c71..01d17a3 100644 (file)
--- a/lustre/mgs/mgs_internal.h
+++ b/lustre/mgs/mgs_internal.h
@@ -5,12 +5,34 @@
 #ifndef _MGS_INTERNAL_H
 #define _MGS_INTERNAL_H
 
-#include <linux/lustre_mgs.h>
+#ifdef __KERNEL__
+# include <linux/fs.h>
+# include <linux/dcache.h>
+#endif
+#include <linux/lustre_handles.h>
+#include <libcfs/kp30.h>
+#include <linux/lustre_idl.h>
+#include <linux/lustre_lib.h>
+#include <linux/lustre_dlm.h>
+#include <linux/lustre_log.h>
+#include <linux/lustre_export.h>
+
 
 /* MDS has o_t * 1000 */
 #define MGS_SERVICE_WATCHDOG_TIMEOUT (obd_timeout * 10)
 
-extern struct lvfs_callback_ops mgs_lvfs_ops;
+/* mgs_llog.c */
+#define FSDB_EMPTY 0x0001
+
+struct fs_db {
+        char              fsdb_name[8];
+        struct list_head  fsdb_list;
+        struct semaphore  fsdb_sem;
+        void*             fsdb_ost_index_map;
+        void*             fsdb_mdt_index_map;
+        __u32             fsdb_flags;
+        __u32             fsdb_gen;
+};
 
 int mgs_init_fsdb_list(struct obd_device *obd);
 int mgs_cleanup_fsdb_list(struct obd_device *obd);
@@ -20,5 +42,9 @@ int mgs_upgrade_sv_14(struct obd_device *obd, struct mgs_target_info *mti);
 int mgs_erase_logs(struct obd_device *obd, char *fsname);
 int mgs_setparam(struct obd_device *obd, char *fsname, struct lustre_cfg *lcfg);
 
+/* mgs_fs.c */
+int mgs_fs_setup(struct obd_device *obd, struct vfsmount *mnt);
+int mgs_fs_cleanup(struct obd_device *obddev);
+
 
 #endif

diff --git a/lustre/mgs/mgs_llog.c b/lustre/mgs/mgs_llog.c
index 9fe3af1..518b101 100644 (file)
--- a/lustre/mgs/mgs_llog.c
+++ b/lustre/mgs/mgs_llog.c
@@ -43,7 +43,6 @@
 #include <linux/lvfs.h>
 #include <linux/lustre_fsfilt.h>
 #include <linux/lustre_disk.h>
-#include <linux/lustre_mgs.h>
 #include "mgs_internal.h"