From: Lai Siyao Date: Wed, 17 Oct 2018 23:25:29 +0000 (+0800) Subject: LU-4684 lod: parse layout for migrating directory X-Git-Tag: 2.12.0-RC1~125 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=83aa8ffcf2e8a5b7da9ead941ed0b22a435d6790;p=fs%2Flustre-release.git LU-4684 lod: parse layout for migrating directory If directory migration failed, it will be marked LMV_HASH_FLAG_MIGRATION, lod_parse_dir_striping() should parse layout for such directory, otherwise such directory can't be accessed correctly. Signed-off-by: Lai Siyao Change-Id: I5ee2c2e3e5aa3f9befc3ad81be4bcdc6f9267842 Reviewed-on: https://review.whamcloud.com/33456 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Mike Pershin Reviewed-by: Oleg Drokin --- diff --git a/lustre/lod/lod_object.c b/lustre/lod/lod_object.c index ce578bc..babe445 100644 --- a/lustre/lod/lod_object.c +++ b/lustre/lod/lod_object.c @@ -1662,9 +1662,6 @@ int lod_parse_dir_striping(const struct lu_env *env, struct lod_object *lo, LASSERT(mutex_is_locked(&lo->ldo_layout_mutex)); - if (le32_to_cpu(lmv1->lmv_hash_type) & LMV_HASH_FLAG_MIGRATION) - RETURN(0); - if (le32_to_cpu(lmv1->lmv_magic) == LMV_MAGIC_STRIPE) { lo->ldo_dir_slave_stripe = 1; RETURN(0);