LU-14314 tests: skip test_16e from sanityn

[fs/lustre-release.git] / lustre / lfsck / lfsck_striped_dir.c

diff --git a/lustre/lfsck/lfsck_striped_dir.c b/lustre/lfsck/lfsck_striped_dir.c
index 2e7bef7..5d73261 100644 (file)
--- a/lustre/lfsck/lfsck_striped_dir.c
+++ b/lustre/lfsck/lfsck_striped_dir.c
@@ -979,7 +979,7 @@ static inline bool lfsck_name_hash_match(struct lmv_mds_md_v1 *lmv,
        if (idx == lmv->lmv_master_mdt_index)
                return true;
 
-       if (!(lmv->lmv_hash_type & LMV_HASH_FLAG_LAYOUT_CHANGE))
+       if (!lmv_hash_is_layout_changing(lmv->lmv_hash_type))
                return false;
 
        idx = lmv_name_to_stripe_index(lmv, name, namelen);
@@ -1998,9 +1998,9 @@ int lfsck_namespace_striped_dir_rescan(const struct lu_env *env,
                        continue;
 
                lnr->lnr_fid = *cfid;
-               lnr->lnr_namelen = snprintf(lnr->lnr_name,
-                                           lnr->lnr_size - sizeof(*lnr),
-                                           DFID":%u", PFID(cfid), i);
+               lnr->lnr_namelen = scnprintf(lnr->lnr_name,
+                                            lnr->lnr_size - sizeof(*lnr),
+                                            DFID":%u", PFID(cfid), i);
                cname = lfsck_name_get_const(env, lnr->lnr_name,
                                             lnr->lnr_namelen);
                obj = lfsck_object_find_bottom(env, lfsck, cfid);