Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0d01af6e5dd6bc7abbcb6331021f8fee18005540
Commit:     0d01af6e5dd6bc7abbcb6331021f8fee18005540
Parent:     756a1501ddbbe73098aa031939460930f6edc9cd
Author:     Sunil Mushran <[EMAIL PROTECTED]>
AuthorDate: Tue Apr 17 13:32:20 2007 -0700
Committer:  Mark Fasheh <[EMAIL PROTECTED]>
CommitDate: Thu Apr 26 13:33:11 2007 -0700

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Mark Fasheh <[EMAIL PROTECTED]>
---
 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 c558442..5b9c608 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -430,11 +430,10 @@ redo_bucket:
 
                        dlm_lockres_put(res);
 
-                       cond_resched_lock(&dlm->spinlock);
-
                        if (dropped)
                                goto redo_bucket;
                }
+               cond_resched_lock(&dlm->spinlock);
                num += n;
                mlog(0, "%s: touched %d lockreses in bucket %d "
                     "(tot=%d)\n", dlm->name, n, i, num);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to