Branch b1_4_newconfig2

b=6663
mount and umount working for bare mds

diff --git a/lustre/mds/mds_lov.c b/lustre/mds/mds_lov.c
index f2da53c..424a58a 100644 (file)
--- a/lustre/mds/mds_lov.c
+++ b/lustre/mds/mds_lov.c
@@ -92,6 +92,9 @@ int mds_lov_write_objids(struct obd_device *obd)
         int i, rc, size = mds->mds_lov_desc.ld_tgt_count * sizeof(obd_id);
         ENTRY;
 
+        if (!mds->mds_lov_desc.ld_tgt_count)
+                RETURN(0);
+
         for (i = 0; i < mds->mds_lov_desc.ld_tgt_count; i++)
                 CDEBUG(D_INFO, "writing last object "LPU64" for idx %d\n",
                        mds->mds_lov_objids[i], i);

diff --git a/lustre/mgc/.cvsignore b/lustre/mgc/.cvsignore
new file mode 100644 (file)
index 0000000..d5103fa
--- /dev/null
+++ b/lustre/mgc/.cvsignore
@@ -0,0 +1,15 @@
+.Xrefs
+config.log
+config.status
+configure
+Makefile
+.deps
+TAGS
+.*.cmd
+autoMakefile.in
+autoMakefile
+*.ko
+*.mod.c
+.*.o.flags
+.tmp_versions
+.depend

diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c
index 29e8973..699cf12 100644 (file)
--- a/lustre/obdclass/obd_mount.c
+++ b/lustre/obdclass/obd_mount.c
@@ -749,9 +749,11 @@ static void server_put_super(struct super_block *sb)
                 list_del(&dirent->lld_list);
                 
                 logname = dirent->lld_name;
+                CERROR("file: %s\n", logname);
+
                 /* Confobd start adds "-conf" */
                 len = strlen(logname) - 5;
-                if ((len < 1) || strcmp(logname, "-conf")) {
+                if ((len < 1) || (strcmp(logname + len, "-conf") != 0)) {
                         CDEBUG(D_CONFIG, "ignoring %s\n", logname);
                         OBD_FREE(dirent, sizeof(*dirent));
                         continue;

diff --git a/lustre/utils/.cvsignore b/lustre/utils/.cvsignore
index 59147ac..53539a4 100644 (file)
--- a/lustre/utils/.cvsignore
+++ b/lustre/utils/.cvsignore
@@ -15,8 +15,9 @@ obdbarrier
 lload
 wirecheck
 lfs
-llmount
-mount.lustre
+mkfs_lustre
+mount_lustre
+llog_reader
 wiretest
 .*.cmd
 .*.d