Revert "LU-3027 clio: Do not shrink sublock at cancel"

This uenxpectedly let do LU-7834 whic appears to be old problem,
but happens more frequently with lu-3027 patch in place.
Reverting till the better solutoin is found as the side-effect is worse
than the original problem.

This reverts commit 3781d4465c9fa72120f35084d4eb5edb55a0b66a.

diff --git a/lustre/lov/lovsub_lock.c b/lustre/lov/lovsub_lock.c
index 393688a..a76acf2 100644 (file)
--- a/lustre/lov/lovsub_lock.c
+++ b/lustre/lov/lovsub_lock.c
@@ -415,12 +415,15 @@ static void lovsub_lock_delete(const struct lu_env *env,
                 struct lov_lock      *lov;
                 struct lov_lock_link *scan;
                 struct lov_lock_link *temp;
+                struct lov_lock_sub  *subdata;
 
                 restart = 0;
                 cfs_list_for_each_entry_safe(scan, temp,
                                              &sub->lss_parents, lll_list) {
                         lov     = scan->lll_super;
+                        subdata = &lov->lls_sub[scan->lll_idx];
                         lovsub_parent_lock(env, lov);
+                        subdata->sub_got = subdata->sub_descr;
                         lov_lock_unlink(env, scan, sub);
                         restart = lovsub_lock_delete_one(env, child, lov);
                         lovsub_parent_unlock(env, lov);