X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_lockd.c;h=ebaa261a7b93946ac9c4cfaa44bcab53678933aa;hp=23bd76f5117b4722e17d99f7db3ca85d0d02d387;hb=5d8f6742e65d588d907b77ffc6fcdb2552d855b9;hpb=8c193654168181686e3b8f40ddb70f9fa7519db0

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 23bd76f..ebaa261 100644
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -258,7 +258,8 @@ static int expired_lock_main(void *arg)
 					   lock->l_blast_sent,
 					   obd_export_nid2str(export));
 				ldlm_lock_to_ns(lock)->ns_timeouts++;
-				do_dump++;
+				if (do_dump_on_eviction(export->exp_obd))
+					do_dump++;
 				class_fail_export(export);
 			}
 			class_export_lock_put(export, lock);
@@ -272,7 +273,7 @@ static int expired_lock_main(void *arg)
 		}
 		spin_unlock_bh(&waiting_locks_spinlock);
 
-		if (do_dump && obd_dump_on_eviction) {
+		if (do_dump) {
 			CERROR("dump the log upon eviction\n");
 			libcfs_debug_dumplog();
 		}