X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Fllite_lib.c;h=f006c3802911be05534c596c5fb86ca7e3de22fc;hp=bad3fb3d63878fc1809feb9e0741dbab77836b39;hb=ba2ecf04beab65a6a4c8399c6a740999de218ece;hpb=826addfa95ae6c5eb9f8ebfa6e3b38293b38bfb9 diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index bad3fb3..f006c38 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -409,12 +409,13 @@ int lustre_common_fill_super(struct super_block *sb, char *lmv, char *lov, if (err) GOTO(out_lmv, err); + /*connect GSS*/ err = lustre_init_crypto(sb, gkc, data, async); if (err) { CERROR("Could not connect to GSS err %d\n", err); err = 0; } - /*connect GSS*/ + err = lustre_init_root_inode(sb); if (err) GOTO(out_gks, err); @@ -876,6 +877,7 @@ static int lustre_process_profile(struct super_block *sb, cfg.cfg_instance = sbi->ll_instance; cfg.cfg_uuid = sbi->ll_sb_uuid; cfg.cfg_local_nid = lmd->lmd_local_nid; + cfg.cfg_flags |= CFG_MODIFY_UUID_FL; err = lustre_process_log(lmd, lmd->lmd_profile, &cfg, 0); if (err < 0) { CERROR("Unable to process log: %s\n", lmd->lmd_profile); @@ -942,6 +944,7 @@ static int lustre_clean_profile(struct ll_sb_info *sbi, int force_umount) } if (sbi->ll_instance != NULL) { + cfg.cfg_flags |= CFG_MODIFY_UUID_FL; cfg.cfg_instance = sbi->ll_instance; cfg.cfg_uuid = sbi->ll_sb_uuid;