*** empty log message ***

diff --git a/lustre/include/linux/lustre_export.h b/lustre/include/linux/lustre_export.h
index 027e692..6592768 100644 (file)
--- a/lustre/include/linux/lustre_export.h
+++ b/lustre/include/linux/lustre_export.h
@@ -11,14 +11,7 @@
 /*export struct for mount-conf */
 /*FIXME: some attributes Mixed now*/
 /* Data stored per client in the last_rcvd file.  In le32 order. */
-struct mgs_client_data {
-        __u8 mcd_uuid[40];      /* client UUID */
-        __u64 mcd_last_transno; /* last completed transaction ID */
-        __u64 mcd_last_xid;     /* xid for the last transaction */
-        __u32 mcd_last_result;  /* result from last RPC */
-        __u32 mcd_last_data;    /* per-op data (disposition for open &c.) */
-        __u8 mcd_padding[MDS_LR_CLIENT_SIZE - 64];
-};
+struct mgs_client_data; 
 
 struct mgs_export_data {
         struct list_head        med_open_head;

diff --git a/lustre/include/linux/lustre_log.h b/lustre/include/linux/lustre_log.h
index 7c7aed8..c412cd5 100644 (file)
--- a/lustre/include/linux/lustre_log.h
+++ b/lustre/include/linux/lustre_log.h
@@ -58,9 +58,10 @@ struct cat_handle_data {
 /* In-memory descriptor for a log object or log catalog */
 struct llog_handle {
         struct rw_semaphore     lgh_lock;
-        struct llog_logid       lgh_id;              /* id of this log */
+        struct llog_logid       lgh_id;             /* id of this log */
         struct llog_log_hdr    *lgh_hdr;
         struct file            *lgh_file;
+        char                   *lgh_fsname;
         int                     lgh_last_idx;
         struct llog_ctxt       *lgh_ctxt;
         union {

diff --git a/lustre/include/linux/obd.h b/lustre/include/linux/obd.h
index 5ef5d20..8e29291 100644 (file)
--- a/lustre/include/linux/obd.h
+++ b/lustre/include/linux/obd.h
@@ -319,6 +319,7 @@ struct mgs_obd {
         struct vfsmount                 *mgs_vfsmnt;
         struct super_block              *mgs_sb;
         struct dentry                   *mgs_configs_dir;
+        struct list_head                 mgs_open_logs;
         struct llog_handle              *mgs_cfg_llh;
 };