diff options
author | Sunil Mushran <sunil.mushran@oracle.com> | 2007-04-17 16:32:20 -0400 |
---|---|---|
committer | Mark Fasheh <mark.fasheh@oracle.com> | 2007-04-26 16:33:11 -0400 |
commit | 0d01af6e5dd6bc7abbcb6331021f8fee18005540 (patch) | |
tree | 39a5bdba2562512579a6f5e5d46c515bfc96394a /fs | |
parent | 756a1501ddbbe73098aa031939460930f6edc9cd (diff) |
ocfs2_dlm: Call cond_resched_lock() once per hash bucket scan
In dlm_migrate_all_locks(), we currently call cond_resched_lock() after
processing each lockres in a hash bucket. Move it outside the loop so as to
call it only after the entire hash bucket has been processed.
Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ocfs2/dlm/dlmdomain.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c index c558442a0b44..5b9c6089082a 100644 --- a/fs/ocfs2/dlm/dlmdomain.c +++ b/fs/ocfs2/dlm/dlmdomain.c | |||
@@ -430,11 +430,10 @@ redo_bucket: | |||
430 | 430 | ||
431 | dlm_lockres_put(res); | 431 | dlm_lockres_put(res); |
432 | 432 | ||
433 | cond_resched_lock(&dlm->spinlock); | ||
434 | |||
435 | if (dropped) | 433 | if (dropped) |
436 | goto redo_bucket; | 434 | goto redo_bucket; |
437 | } | 435 | } |
436 | cond_resched_lock(&dlm->spinlock); | ||
438 | num += n; | 437 | num += n; |
439 | mlog(0, "%s: touched %d lockreses in bucket %d " | 438 | mlog(0, "%s: touched %d lockreses in bucket %d " |
440 | "(tot=%d)\n", dlm->name, n, i, num); | 439 | "(tot=%d)\n", dlm->name, n, i, num); |