Override the local_nid in the logs during zeroconf mount. If the

local_nid option is not specified, then mount.lustre will use
the hostname for socknal, or /proc/elan/device0/position for qswnal.

For nettype=elan, if remote_nid isn't set the mount.lustre will
attempt to parse the hostname and use the first series of numbers as
the nid.  So, mdev20-eth1 will become elan id 20.

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 4e3210d..bd94fdd 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -512,6 +512,7 @@ int lustre_fill_super(struct super_block *sb, void *data, int silent)
 
                 cfg.cfg_instance = sbi->ll_instance;
                 cfg.cfg_uuid = sbi->ll_sb_uuid;
+                cfg.cfg_local_nid = lmd->lmd_local_nid;
                 err = lustre_process_log(lmd, lmd->lmd_profile, &cfg);
                 if (err < 0) {
                         CERROR("Unable to process log: %s\n", lmd->lmd_profile);