LU-1900 test: check for lustre version in sanity-scrub

[fs/lustre-release.git] / lustre / osc / osc_lock.c

diff --git a/lustre/osc/osc_lock.c b/lustre/osc/osc_lock.c
index a4b9be0..ffcfdf7 100644 (file)
--- a/lustre/osc/osc_lock.c
+++ b/lustre/osc/osc_lock.c
@@ -200,11 +200,13 @@ static int osc_lock_unuse(const struct lu_env *env,
                 LASSERT(!ols->ols_hold);
                 LASSERT(ols->ols_agl);
                 return 0;
+       case OLS_UPCALL_RECEIVED:
+               osc_lock_unhold(ols);
        case OLS_ENQUEUED:
-        case OLS_UPCALL_RECEIVED:
-                LASSERT(!ols->ols_hold);
-                ols->ols_state = OLS_NEW;
-                return 0;
+               LASSERT(!ols->ols_hold);
+               osc_lock_detach(env, ols);
+               ols->ols_state = OLS_NEW;
+               return 0;
         case OLS_GRANTED:
                 LASSERT(!ols->ols_glimpse);
                 LASSERT(ols->ols_hold);