From c90c9d4f26cf7223ff73f8cf82f7aa33bb6d9a54 Mon Sep 17 00:00:00 2001 From: "Alexander.Boyko" Date: Thu, 17 May 2012 16:48:09 +0400 Subject: [PATCH] LU-1418 osc: remove DEADLOCK error messages Deadlock is impossible for the current code, and the check exist from some previous version. It can be removed. Signed-off-by: Alexander Boyko Xyratex-bug-id: MRP-497 Change-Id: Ifbd4270739894c946553952d86ff931c4c707791 Reviewed-on: http://review.whamcloud.com/2825 Tested-by: Hudson Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: Jinshan Xiong Reviewed-by: Oleg Drokin --- lustre/osc/osc_lock.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lustre/osc/osc_lock.c b/lustre/osc/osc_lock.c index d5555d1..467295f 100644 --- a/lustre/osc/osc_lock.c +++ b/lustre/osc/osc_lock.c @@ -1117,14 +1117,6 @@ static int osc_lock_enqueue_wait(const struct lu_env *env, if (!lockless && osc_lock_compatible(olck, scan_ols)) continue; - /* Now @scan is conflicting with @lock, this means current - * thread have to sleep for @scan being destroyed. */ - if (scan_ols->ols_owner == osc_env_io(env)) { - CERROR("DEADLOCK POSSIBLE!\n"); - CL_LOCK_DEBUG(D_ERROR, env, scan, "queued.\n"); - CL_LOCK_DEBUG(D_ERROR, env, lock, "queuing.\n"); - libcfs_debug_dumpstack(NULL); - } cl_lock_get_trust(scan); conflict = scan; break; -- 1.8.3.1