Branch b1_5

b=8007
-fix use-after-free found by CONFIG_DEBUG_PAGEALLOC
-generate ogdb in $TMP instead of /tmp for umls

diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c
index ceb6348..7fb5999 100644 (file)
--- a/lustre/obdclass/obd_mount.c
+++ b/lustre/obdclass/obd_mount.c
@@ -744,8 +744,9 @@ static int lustre_stop_mgc(struct super_block *sb)
         if (obd->u.cli.cl_mgc_mgsexp)
                 obd_disconnect(obd->u.cli.cl_mgc_mgsexp);
 
-        /* Save the obdname for cleaning the nid uuids */
-        len = strlen(obd->obd_name) + 3;
+        /* Save the obdname for cleaning the nid uuids, which are 
+           obdnameXX */
+        len = strlen(obd->obd_name) + 5;
         OBD_ALLOC(niduuid, len);
         if (niduuid) {
                 strcpy(niduuid, obd->obd_name);
@@ -761,7 +762,7 @@ static int lustre_stop_mgc(struct super_block *sb)
                 RETURN(-ENOMEM);
         for (i = 0; i < lsi->lsi_lmd->lmd_mgs_failnodes; i++) {
                 sprintf(ptr, "%x", i);
-                rc = do_lcfg(obd->obd_name, 0, LCFG_DEL_UUID, 
+                rc = do_lcfg(LUSTRE_MGC_OBDNAME, 0, LCFG_DEL_UUID, 
                              niduuid, 0, 0, 0);
                 if (rc)
                         CERROR("del MDC UUID %s failed: rc = %d\n", 

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 9dbcb14..6a1932b 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -110,8 +110,8 @@ load_modules() {
     load_module llite/lustre
     load_module mgc/mgc
     load_module mgs/mgs
-    rm -f /tmp/ogdb-`hostname`
-    $LCTL modules > /tmp/ogdb-`hostname`
+    rm -f $TMP/ogdb-`hostname`
+    $LCTL modules > $TMP/ogdb-`hostname`
     # 'mount' doesn't look in $PATH, just sbin
     cp $LUSTRE/utils/mount.lustre /sbin/.
 }