LU-10212 ldlm: fix prolong for destroyed lock

[fs/lustre-release.git] / lustre / ofd / ofd_dev.c

diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c
index 8b498c0..8ac0469 100644 (file)
--- a/lustre/ofd/ofd_dev.c
+++ b/lustre/ofd/ofd_dev.c
@@ -1332,6 +1332,16 @@ static int ofd_getattr_hdl(struct tgt_session_info *tsi)
                        repbody->oa.o_valid |= OBD_MD_FLDATAVERSION;
                        repbody->oa.o_data_version = curr_version;
                }
+
+               if (fo->ofo_ff.ff_layout_version > 0) {
+                       repbody->oa.o_valid |= OBD_MD_LAYOUT_VERSION;
+                       repbody->oa.o_layout_version =
+                            fo->ofo_ff.ff_layout_version + fo->ofo_ff.ff_range;
+
+                       CDEBUG(D_INODE, DFID": get layout version: %u\n",
+                              PFID(&tsi->tsi_fid),
+                              repbody->oa.o_layout_version);
+               }
        }
 
        ofd_object_put(tsi->tsi_env, fo);
@@ -1916,6 +1926,8 @@ static int ofd_statfs_hdl(struct tgt_session_info *tsi)
 
        ENTRY;
 
+       OBD_FAIL_TIMEOUT(OBD_FAIL_OST_STATFS_DELAY, 10);
+
        osfs = req_capsule_server_get(tsi->tsi_pill, &RMF_OBD_STATFS);
 
        rc = ofd_statfs(tsi->tsi_env, tsi->tsi_exp, osfs,
@@ -2418,10 +2430,14 @@ static void ofd_prolong_extent_locks(struct tgt_session_info *tsi,
                                LASSERT(lock->l_export == data->lpa_export);
                                ldlm_lock_prolong_one(lock, data);
                                LDLM_LOCK_PUT(lock);
-                               RETURN_EXIT;
+                               if (data->lpa_locks_cnt > 0)
+                                       RETURN_EXIT;
+                               /* The lock was destroyed probably lets try
+                                * resource tree. */
+                       } else {
+                               lock->l_last_used = ktime_get();
+                               LDLM_LOCK_PUT(lock);
                        }
-                       lock->l_last_used = ktime_get();
-                       LDLM_LOCK_PUT(lock);
                }
        }