Branch b1_4_mountconf

b=8159
time to get this stuff to compile

diff --git a/lustre/include/linux/lustre_disk.h b/lustre/include/linux/lustre_disk.h
index 4102cdb..cf6e3a1 100644 (file)
--- a/lustre/include/linux/lustre_disk.h
+++ b/lustre/include/linux/lustre_disk.h
@@ -215,6 +215,8 @@ void lustre_register_client_fill_super(int (*cfs)(struct super_block *sb));
 void lustre_common_put_super(struct super_block *sb);
 struct lustre_mount_info *lustre_get_mount(char *name);
 int lustre_put_mount(char *name);
+int lustre_get_process_log(struct super_block *, char *, 
+                           struct config_llog_instance *);
 
 #endif
 

diff --git a/lustre/include/linux/lustre_idl.h b/lustre/include/linux/lustre_idl.h
index 7eb2f72..b6ca8b3 100644 (file)
--- a/lustre/include/linux/lustre_idl.h
+++ b/lustre/include/linux/lustre_idl.h
@@ -841,7 +841,6 @@ struct ldlm_flock {
         __u32 pid;
 };
 
-
 /* it's important that the fields of the ldlm_extent structure match
  * the first fields of the ldlm_flock structure because there is only
  * one ldlm_swab routine to process the ldlm_policy_data_t union. if
@@ -1104,8 +1103,7 @@ struct llog_log_hdr {
         __u32                   llh_cat_idx;
         /* for a catalog the first plain slot is next to it */
         struct obd_uuid         llh_tgtuuid;
-        __u64                   llh_version;
-        __u32                   llh_reserved[LLOG_HEADER_SIZE/sizeof(__u32) - 21];
+        __u32                   llh_reserved[LLOG_HEADER_SIZE/sizeof(__u32) - 23];
         __u32                   llh_bitmap[LLOG_BITMAP_BYTES/sizeof(__u32)];
         struct llog_rec_tail    llh_tail;
 } __attribute__((packed));
@@ -1141,7 +1139,6 @@ struct llogd_body {
         __u32 lgd_saved_index;
         __u32 lgd_len;
         __u64 lgd_cur_offset;
-        __u64 lgd_local_version;
 } __attribute__((packed));
 
 struct llogd_conn_body {

diff --git a/lustre/include/linux/obd_class.h b/lustre/include/linux/obd_class.h
index f927544..6e00fd7 100644 (file)
--- a/lustre/include/linux/obd_class.h
+++ b/lustre/include/linux/obd_class.h
@@ -53,6 +53,7 @@ extern spinlock_t obd_dev_lock;
 #define LUSTRE_MDS_NAME "mds"
 #define LUSTRE_MDT_NAME "mdt"
 #define LUSTRE_MDC_NAME "mdc"
+#define LUSTRE_OSS_NAME "oss"
 #define LUSTRE_OST_NAME "ost"
 #define LUSTRE_OSC_NAME "osc"
 #define LUSTRE_MGS_NAME "mgs"
@@ -161,6 +162,7 @@ void class_import_put(struct obd_import *);
 struct obd_import *class_new_import(void);
 void class_destroy_import(struct obd_import *exp);
 
+struct obd_type *class_search_type(char *name);
 struct obd_type *class_get_type(char *name);
 void class_put_type(struct obd_type *type);
 int class_connect(struct lustre_handle *conn, struct obd_device *obd,

diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index f0dc07b..911dfc9 100644 (file)
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -90,7 +90,7 @@ static ldlm_processing_policy ldlm_processing_policy_table[] = {
         [LDLM_EXTENT] ldlm_process_extent_lock,
 #ifdef __KERNEL__
         [LDLM_FLOCK] ldlm_process_flock_lock,
-        [LDLM_LLOG]  ldlm_process_llog_lock,
+        //[LDLM_LLOG]  ldlm_process_llog_lock,
 #endif
 };
 

diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index ccf303e..9eb183c 100644 (file)
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -393,6 +393,7 @@ EXPORT_SYMBOL(proc_lustre_root);
 
 EXPORT_SYMBOL(class_register_type);
 EXPORT_SYMBOL(class_unregister_type);
+EXPORT_SYMBOL(class_search_type);
 EXPORT_SYMBOL(class_get_type);
 EXPORT_SYMBOL(class_put_type);
 EXPORT_SYMBOL(class_name2dev);

diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c
index 79c730a..001caf1 100644 (file)
--- a/lustre/obdclass/genops.c
+++ b/lustre/obdclass/genops.c
@@ -62,7 +62,7 @@ void (*ptlrpc_abort_inflight_superhack)(struct obd_import *imp);
  * support functions: we could use inter-module communication, but this
  * is more portable to other OS's
  */
-static struct obd_type *class_search_type(char *name)
+struct obd_type *class_search_type(char *name)
 {
         struct list_head *tmp;
         struct obd_type *type;

diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c
index 3c17bee..9ce4dca 100644 (file)
--- a/lustre/obdclass/obd_mount.c
+++ b/lustre/obdclass/obd_mount.c
@@ -26,12 +26,13 @@
 
 #include <linux/obd.h>
 #include <linux/lvfs.h>
-#include <linux/lustre_disk.h>
 #include <linux/lustre_fsfilt.h>
 //#include <linux/lustre_mgs.h>
 #include <linux/obd_class.h>
 #include <lustre/lustre_user.h>
 #include <linux/version.h> 
+#include <linux/lustre_log.h>
+#include <linux/lustre_disk.h>
                       
 static int (*client_fill_super)(struct super_block *sb) = NULL;
 
@@ -179,42 +180,6 @@ int lustre_put_mount(char *name)
 
 /******* mount helper utilities *********/
 
-static int dentry_readdir(struct obd_device *obd, struct dentry *dir, 
-                          struct vfsmount *inmnt, struct list_head *dentry_list)
-{
-        /* see mds_cleanup_orphans */
-        struct lvfs_run_ctxt saved;
-        struct file *file;
-        struct dentry *dentry;
-        struct vfsmount *mnt;
-        int err = 0;
-        ENTRY;
-
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
-        dentry = dget(dir);
-        if (IS_ERR(dentry))
-                GOTO(out_pop, err = PTR_ERR(dentry));
-        mnt = mntget(inmnt);
-        if (IS_ERR(mnt)) { 
-                l_dput(dentry);
-                GOTO(out_pop, err = PTR_ERR(mnt));
-        }
-
-        file = dentry_open(dentry, mnt, O_RDONLY);
-        if (IS_ERR(file))
-                /* dentry_open_it() drops the dentry, mnt refs */
-                GOTO(out_pop, err = PTR_ERR(file));
-
-        INIT_LIST_HEAD(dentry_list);
-        err = l_readdir(file, dentry_list);
-        filp_close(file, 0);
-        /*  filp_close->fput() drops the dentry, mnt refs */
-
-out_pop:
-        pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
-        RETURN(err);
-}
-
 int parse_mount_data(struct lvfs_run_ctxt *mount_ctxt, 
                      struct lustre_disk_data *ldd)
 {
@@ -326,22 +291,21 @@ int lustre_get_process_log(struct super_block *sb, char *profile,
         exp = class_conn2export(&mgc_conn);
 
         ctxt = llog_get_context(exp->exp_obd, LLOG_CONFIG_REPL_CTXT);
-#if 1
-        rc = class_config_parse_llog(ctxt, profile, cfg);
-#else
+#if 0
         /* For debugging, it's useful to just dump the log */
         rc = class_config_dump_llog(ctxt, profile, cfg);
 #endif
+        rc = class_config_parse_llog(ctxt, profile, cfg);
 
         switch (rc) {
         case 0:
                 break;
         case -EINVAL:
                 LCONSOLE_ERROR("%s: The configuration '%s' could not be read "
-                               "from the MDS.  Make sure this client and the "
-                               "MDS are running compatible versions of "
+                               "from the MGS.  Make sure this client and the "
+                               "MGS are running compatible versions of "
                                "Lustre.\n",
-                               obd->obd_name, profile);
+                               mgc->obd_name, profile);
                 /* fall through */
         default:
                 CERROR("class_config_parse_llog failed: rc = %d\n", rc);
@@ -419,7 +383,6 @@ static int lustre_start_simple(char *obdname, char *type, char *s1, char *s2)
 /* Set up a mgsobd to process startup logs */
 static int lustre_start_mgs(struct super_block *sb, struct vfsmount *mnt)
 {
-        struct config_llog_instance cfg;
         char*  mgsname;
         int    mgsname_size, err = 0;
 
@@ -567,16 +530,29 @@ static int server_start_targets(struct super_block *sb)
         if (err) {
                 CERROR("failed to start server %s: %d\n",
                        sbi->lsi_ldd->ldd_svname, err);
+                return (err);
         }
                                                                                        
         /* If we're an MDT, make sure the global MDS is running */
         if (sbi->lsi_ldd->ldd_flags & LDD_F_SV_TYPE_MDT) {
                 /* make sure (what will be called) the MDS is started */
                 obd = class_name2obd("MDS");
-                if (!obd) 
+                if (!obd) {
                         //FIXME pre-rename, should eventually be LUSTRE_MDS_NAME
-                        err = lustre_start_simple("MDS", LUSTRE_MDT_NAME);
+                        err = lustre_start_simple("MDS", LUSTRE_MDT_NAME, 0, 0);
+                        if (err) 
+                                CERROR("failed to start MDS: %d\n", err);
+                }
         }
+
+        /* If we're an OST, make sure the global OSS is running */
+        if (sbi->lsi_ldd->ldd_flags & LDD_F_SV_TYPE_OST) {
+                /* make sure OSS is started */
+                obd = class_name2obd("OSS");
+                if (!obd) 
+                        err = lustre_start_simple("OSS", LUSTRE_OSS_NAME, 0, 0);
+        }
+
         return(err);
 }
 
@@ -731,7 +707,21 @@ static void server_put_super(struct super_block *sb)
                 //FIXME pre-rename, should eventually be LUSTRE_MDT_NAME
                 struct obd_type *type = class_search_type(LUSTRE_MDS_NAME);
                 if (!type || !type->typ_refcnt) {
-                        /* nobody is using the MDT type */
+                        /* nobody is using the MDT type, clean the MDS */
+                        if (sbi->lsi_flags & LSI_UMOUNT_FORCE)
+                                obd->obd_force = 1;
+                        if (sbi->lsi_flags & LSI_UMOUNT_FAILOVER)
+                                obd->obd_fail = 1;
+                        class_manual_cleanup(obd);
+                }
+        }
+
+        /* if this was an OST, and there are no more OST's, clean up the OSS */
+        if ((sbi->lsi_ldd->ldd_flags & LDD_F_SV_TYPE_OST) &&
+            (obd = class_name2obd("OSS"))) {
+                struct obd_type *type = class_search_type(LUSTRE_OST_NAME);
+                if (!type || !type->typ_refcnt) {
+                        /* nobody is using the OST type, clean the OSS */
                         if (sbi->lsi_flags & LSI_UMOUNT_FORCE)
                                 obd->obd_force = 1;
                         if (sbi->lsi_flags & LSI_UMOUNT_FAILOVER)
@@ -752,10 +742,12 @@ static void server_put_super(struct super_block *sb)
 static void server_umount_begin(struct super_block *sb)
 {
         struct lustre_sb_info *sbi = s2sbi(sb);
-                                                                                       
-        CERROR("Umount -f\n");
-        // FIXME decide FORCE or FAILOVER based on mount option -o umount=failover
-        sbi->lsi_flags |= LSI_UMOUNT_FORCE;
+                                                                                     
+        CERROR("umount -f\n");
+        /* umount = normal
+           umount -f = failover
+           no third way to do LSI_UMOUNT_FORCE */
+        sbi->lsi_flags |= LSI_UMOUNT_FAILOVER;
 }
 
 #define log2(n) ffz(~(n))