From c79da0095282d2416e2c3bf8f4bec4f1a133d7f4 Mon Sep 17 00:00:00 2001 From: Tao Ma Date: Fri, 28 May 2010 14:22:59 +0800 Subject: [PATCH] --- yaml --- r: 201021 b: refs/heads/master c: 40f165f416bde747d85cdf71bc9dde700912f71f h: refs/heads/master i: 201019: 3f7d07f04a6ae42407131e65f4d645f7f6f1a150 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/journal.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 65da0ad45b43..f78ed04a7db7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6469272c350872980891dbe38e81c936c43f2d9b +refs/heads/master: 40f165f416bde747d85cdf71bc9dde700912f71f diff --git a/trunk/fs/ocfs2/journal.c b/trunk/fs/ocfs2/journal.c index 47878cf16418..39113b5e79e7 100644 --- a/trunk/fs/ocfs2/journal.c +++ b/trunk/fs/ocfs2/journal.c @@ -1936,7 +1936,7 @@ void ocfs2_orphan_scan_work(struct work_struct *work) mutex_lock(&os->os_lock); ocfs2_queue_orphan_scan(osb); if (atomic_read(&os->os_state) == ORPHAN_SCAN_ACTIVE) - schedule_delayed_work(&os->os_orphan_scan_work, + queue_delayed_work(ocfs2_wq, &os->os_orphan_scan_work, ocfs2_orphan_scan_timeout()); mutex_unlock(&os->os_lock); } @@ -1976,8 +1976,8 @@ void ocfs2_orphan_scan_start(struct ocfs2_super *osb) atomic_set(&os->os_state, ORPHAN_SCAN_INACTIVE); else { atomic_set(&os->os_state, ORPHAN_SCAN_ACTIVE); - schedule_delayed_work(&os->os_orphan_scan_work, - ocfs2_orphan_scan_timeout()); + queue_delayed_work(ocfs2_wq, &os->os_orphan_scan_work, + ocfs2_orphan_scan_timeout()); } }