if (sub == NULL)
continue;
- sublock = sub->lss_cl.cls_lock;
- rc = lov_sublock_lock(env, lck, lls, closure, &subenv);
- if (rc == 0) {
- if (lls->sub_flags & LSF_HELD) {
- LASSERT(sublock->cll_state == CLS_HELD ||
- sublock->cll_state == CLS_ENQUEUED);
- rc = cl_unuse_try(subenv->lse_env, sublock);
- rc = lov_sublock_release(env, lck, i, 0, rc);
- }
- lov_sublock_unlock(env, sub, closure, subenv);
- }
- result = lov_subresult(result, rc);
+ sublock = sub->lss_cl.cls_lock;
+ rc = lov_sublock_lock(env, lck, lls, closure, &subenv);
+ if (rc == 0) {
+ if (!(lls->sub_flags & LSF_HELD)) {
+ lov_sublock_unlock(env, sub, closure, subenv);
+ continue;
+ }
+
+ switch(sublock->cll_state) {
+ case CLS_HELD:
+ rc = cl_unuse_try(subenv->lse_env, sublock);
+ lov_sublock_release(env, lck, i, 0, 0);
+ break;
+ default:
+ lov_sublock_release(env, lck, i, 1, 0);
+ break;
+ }
+ lov_sublock_unlock(env, sub, closure, subenv);
+ }
+ result = lov_subresult(result, rc);
}
if (result == 0 && lck->lls_cancel_race) {
* osc_enqueue_fini(). */
ldlm_lock_addref(&handle, mode);
+ /* Let cl_lock_state_wait fail with -ERESTARTSYS to unuse sublocks. */
+ OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_ENQUEUE_HANG, 2);
+
/* Let CP AST to grant the lock first. */
OBD_FAIL_TIMEOUT(OBD_FAIL_OSC_CP_ENQ_RACE, 1);
}
run_test 74 "flock deadlock: different mounts =============="
+# LU-3889
+test_75() {
+ $LFS setstripe -c 2 -S 1m -i 0 $DIR1/$tfile
+ dd if=/dev/zero of=$DIR1/$tfile bs=1M count=2
+ cancel_lru_locks osc
+
+ dd of=$DIR1/$tfile if=/dev/zero bs=1M count=1 seek=1 conv=notrunc
+ sync
+
+ # define OBD_FAIL_LDLM_ENQUEUE_HANG 0x31d
+ $LCTL set_param fail_loc=0x31d
+ stat -c %s $DIR1/$tfile &
+ local pid=$!
+ sleep 1
+ kill -9 $pid
+
+ # For bad lock error handler we should ASSERT and got kernel panic here
+ sleep 4
+ $LCTL set_param fail_loc=0
+}
+run_test 75 "osc: upcall after unuse lock==================="
+
log "cleanup: ======================================================"
[ "$(mount | grep $MOUNT2)" ] && umount $MOUNT2