LU-15300 mdt: refresh LOVEA with LL granted

[fs/lustre-release.git] / lustre / lov / lov_object.c

diff --git a/lustre/lov/lov_object.c b/lustre/lov/lov_object.c
index 57ce475..f8e7886 100644 (file)
--- a/lustre/lov/lov_object.c
+++ b/lustre/lov/lov_object.c
@@ -1390,6 +1390,23 @@ static int lov_conf_set(const struct lu_env *env, struct cl_object *obj,
 
        LASSERT(conf->coc_opc == OBJECT_CONF_SET);
 
+       /*
+        * don't apply old layouts which can be brought
+        * if returned w/o ldlm lock.
+        * XXX: can we rollback in case of recovery?
+        */
+       if (lsm && lov->lo_lsm) {
+               u32 oldgen = lov->lo_lsm->lsm_layout_gen &= ~LU_LAYOUT_RESYNC;
+               u32 newgen = lsm->lsm_layout_gen & ~LU_LAYOUT_RESYNC;
+
+               if (newgen < oldgen) {
+                       CDEBUG(D_HA, "skip old for "DFID": %d < %d\n",
+                              PFID(lu_object_fid(lov2lu(lov))),
+                              (int)newgen, (int)oldgen);
+                       GOTO(out, result = 0);
+               }
+       }
+
        if ((lsm == NULL && lov->lo_lsm == NULL) ||
            ((lsm != NULL && lov->lo_lsm != NULL) &&
             (lov->lo_lsm->lsm_layout_gen == lsm->lsm_layout_gen) &&