Branch b1_4_newconfig2

b=6663
change mgmtnid to mgsnid

diff --git a/lustre/include/linux/lustre_disk.h b/lustre/include/linux/lustre_disk.h
index d409830..a455691 100644 (file)
--- a/lustre/include/linux/lustre_disk.h
+++ b/lustre/include/linux/lustre_disk.h
@@ -90,7 +90,7 @@ struct lustre_disk_data {
 struct lustre_mount_data {
         __u32     lmd_magic;
         __u32     lmd_flags;          /* lustre mount flags */
-        struct host_desc lmd_mgmtnid; /* mgmt nid */
+        struct host_desc lmd_mgsnid;  /* who to contact at startup */
         //struct lustre_disk_data *lmd_ldd; /* in-mem copy of ldd */
         char      lmd_dev[128];       /* device or file system name */
         char      lmd_mtpt[128];      /* mount point (for client overmount) */

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index ec571f0..02cecd5 100644 (file)
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -819,9 +819,9 @@ int write_llog_files(struct mkfs_opts *mop)
 #13 L add_conn 0:MDC_uml1_mdsA_MNT_client 1:NID_uml2_UUID
                 */
                 //FIXME use gethostname for nid uuid? 
-                        do_jt(jt_lcfg_add_uuid, "add_uuid",
-                              libcfs_nid2str(mop->mo_hostnid.primary),
-                              mop->mo_hostnid.primary, 0);
+                        do_jt(jt_lcfg_add_uuid, "add_uuid", 
+                              mop->mo_ldd.ldd_svname /*FIXME mds name */,
+                              libcfs_nid2str(mop->mo_hostnid.primary), 0);
                         do_jt(jt_lcfg_attach,   "attach", "mdc", mdcname, 
                               mdcname/*uuid*/, 0);
                         do_jt(jt_lcfg_device,   "cfg_device", mdcname, 0);

diff --git a/lustre/utils/mount_lustre.c b/lustre/utils/mount_lustre.c
index ce04dd9..3eeb47d 100644 (file)
--- a/lustre/utils/mount_lustre.c
+++ b/lustre/utils/mount_lustre.c
@@ -187,8 +187,8 @@ init_options(struct lustre_mount_data *lmd)
         //ptl_parse_ipaddr(&lmd->lmd_ipaddr, lmd->lmd_hostname); 
         lmd->lmd_magic = LMD_MAGIC;
         lmd->lmd_flags = LMD_FLG_MNTCNF;
-        lmd->lmd_mgmtnid.primary = PTL_NID_ANY;
-        lmd->lmd_mgmtnid.backup  = PTL_NID_ANY;
+        lmd->lmd_mgsnid.primary = PTL_NID_ANY;
+        lmd->lmd_mgsnid.backup  = PTL_NID_ANY;
         return 0;
 }
 
@@ -196,9 +196,9 @@ int
 print_options(struct lustre_mount_data *lmd)
 {
         printf("mgmt primary nid: %s\n",
-               libcfs_nid2str(lmd->lmd_mgmtnid.primary));
+               libcfs_nid2str(lmd->lmd_mgsnid.primary));
         printf("mgmt backup nid:  %s\n",
-               libcfs_nid2str(lmd->lmd_mgmtnid.backup));
+               libcfs_nid2str(lmd->lmd_mgsnid.backup));
         printf("device:           %s\n", lmd->lmd_dev);
         printf("mount point:      %s\n", lmd->lmd_mtpt);
         printf("options:          %s\n", lmd->lmd_opts);
@@ -318,8 +318,8 @@ build_data(char *source, char *target, char *options,
                         printf("CLIENT\n");
                 lmd->lmd_flags |= LMD_FLG_CLIENT;
 
-                /* <mgmtnid>[,<alt mgmtnid>]:/fsname[/fsetname[/subdir/]]
-                   nid=mgmtnid, devname=fsname */
+                /* <mgsnid>[,<alt mgsnid>]:/fsname[/fsetname[/subdir/]]
+                   nid=mgsnid, devname=fsname */
                 nid = buf;
                 *s = '\0';
                 while (*++s == '/') /*spin*/;
@@ -329,10 +329,10 @@ build_data(char *source, char *target, char *options,
                 if (rc)
                         return rc;
 
-                if (lmd->lmd_mgmtnid.primary != PTL_NID_ANY)
+                if (lmd->lmd_mgsnid.primary != PTL_NID_ANY)
                         /* In case it was defined as -o mgmtnode= */
-                        //FIXME set_nid_pair(&lmd->lmd_mgmtnid, nid);
-                if (lmd->lmd_mgmtnid.primary == PTL_NID_ANY) {
+                        //FIXME set_nid_pair(&lmd->lmd_mgsnid, nid);
+                if (lmd->lmd_mgsnid.primary == PTL_NID_ANY) {
                         fprintf(stderr, "%s: can't parse nid '%s'\n",
                                 progname, nid);
                         return 1;