From 41329991598b6c8d7f501c7a44ab786a0e8bfff5 Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Thu, 9 Feb 2006 13:23:39 -0800 Subject: [PATCH] --- yaml --- r: 20413 b: refs/heads/master c: 745ae8ba29e729ec922393fa4d9448c385673599 h: refs/heads/master i: 20411: 7729a5fb20cb7dba311e516da25d4137403df57b v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/journal.c | 7 +++---- trunk/fs/ocfs2/journal.h | 2 -- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 57a384ee5f0e..cac094dec43a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 558c70c59b75a5a53ba496fe3bccea80a9e3e6fb +refs/heads/master: 745ae8ba29e729ec922393fa4d9448c385673599 diff --git a/trunk/fs/ocfs2/journal.c b/trunk/fs/ocfs2/journal.c index fa0bcac5ceae..d329c9df90ae 100644 --- a/trunk/fs/ocfs2/journal.c +++ b/trunk/fs/ocfs2/journal.c @@ -1584,10 +1584,9 @@ static int ocfs2_commit_thread(void *arg) while (!(kthread_should_stop() && atomic_read(&journal->j_num_trans) == 0)) { - wait_event_interruptible_timeout(osb->checkpoint_event, - atomic_read(&journal->j_num_trans) - || kthread_should_stop(), - OCFS2_CHECKPOINT_INTERVAL); + wait_event_interruptible(osb->checkpoint_event, + atomic_read(&journal->j_num_trans) + || kthread_should_stop()); status = ocfs2_commit_cache(osb); if (status < 0) diff --git a/trunk/fs/ocfs2/journal.h b/trunk/fs/ocfs2/journal.h index 7d0a816184fa..2f3a6acdac45 100644 --- a/trunk/fs/ocfs2/journal.h +++ b/trunk/fs/ocfs2/journal.h @@ -29,8 +29,6 @@ #include #include -#define OCFS2_CHECKPOINT_INTERVAL (8 * HZ) - enum ocfs2_journal_state { OCFS2_JOURNAL_FREE = 0, OCFS2_JOURNAL_LOADED,