From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753987AbYI2HDy (ORCPT ); Mon, 29 Sep 2008 03:03:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753461AbYI2HDc (ORCPT ); Mon, 29 Sep 2008 03:03:32 -0400 Received: from e32.co.us.ibm.com ([32.97.110.150]:35684 "EHLO e32.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753413AbYI2HDb (ORCPT ); Mon, 29 Sep 2008 03:03:31 -0400 From: Krishna Kumar To: linux-kernel@vger.kernel.org Cc: Oleg Nesterov , Krishna Kumar Date: Mon, 29 Sep 2008 12:33:28 +0530 Message-Id: <20080929070328.7386.70911.sendpatchset@localhost.localdomain> In-Reply-To: <20080929070302.7386.72726.sendpatchset@localhost.localdomain> References: <20080929070302.7386.72726.sendpatchset@localhost.localdomain> Subject: [REV2: PATCH 2/2]: workqueue: Modify some users to use the new API Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Krishna Kumar Modify some users to use the new API. Signed-off-by: Krishna Kumar --- drivers/net/wireless/ipw2100.c | 12 ++++++------ drivers/net/wireless/libertas/scan.c | 5 ++--- drivers/net/wireless/libertas/wext.c | 7 +++---- fs/afs/vlocation.c | 11 +++-------- fs/ocfs2/cluster/heartbeat.c | 5 ++--- 5 files changed, 16 insertions(+), 24 deletions(-) diff -ruNp 2.6.27-rc7-org/drivers/net/wireless/ipw2100.c 2.6.27-rc7-new/drivers/net/wireless/ipw2100.c --- 2.6.27-rc7-org/drivers/net/wireless/ipw2100.c 2008-09-22 03:59:55.000000000 +0530 +++ 2.6.27-rc7-new/drivers/net/wireless/ipw2100.c 2008-09-29 12:06:55.000000000 +0530 @@ -2085,9 +2085,8 @@ static void isr_indicate_rf_kill(struct /* Make sure the RF Kill check timer is running */ priv->stop_rf_kill = 0; - cancel_delayed_work(&priv->rf_kill); - queue_delayed_work(priv->workqueue, &priv->rf_kill, - round_jiffies_relative(HZ)); + queue_update_delayed_work(priv->workqueue, &priv->rf_kill, + round_jiffies_relative(HZ)); } static void send_scan_event(void *data) @@ -4241,9 +4240,10 @@ static int ipw_radio_kill_sw(struct ipw2 "disabled by HW switch\n"); /* Make sure the RF_KILL check timer is running */ priv->stop_rf_kill = 0; - cancel_delayed_work(&priv->rf_kill); - queue_delayed_work(priv->workqueue, &priv->rf_kill, - round_jiffies_relative(HZ)); + + queue_update_delayed_work(priv->workqueue, + &priv->rf_kill, + round_jiffies_relative(HZ)); } else schedule_reset(priv); } diff -ruNp 2.6.27-rc7-org/drivers/net/wireless/libertas/scan.c 2.6.27-rc7-new/drivers/net/wireless/libertas/scan.c --- 2.6.27-rc7-org/drivers/net/wireless/libertas/scan.c 2008-09-22 03:59:55.000000000 +0530 +++ 2.6.27-rc7-new/drivers/net/wireless/libertas/scan.c 2008-09-29 12:06:55.000000000 +0530 @@ -435,9 +435,8 @@ int lbs_scan_networks(struct lbs_private priv->scan_channel = to_scan; else priv->scan_channel += to_scan; - cancel_delayed_work(&priv->scan_work); - queue_delayed_work(priv->work_thread, &priv->scan_work, - msecs_to_jiffies(300)); + queue_update_delayed_work(priv->work_thread, + &priv->scan_work, msecs_to_jiffies(300)); /* skip over GIWSCAN event */ goto out; } diff -ruNp 2.6.27-rc7-org/drivers/net/wireless/libertas/wext.c 2.6.27-rc7-new/drivers/net/wireless/libertas/wext.c --- 2.6.27-rc7-org/drivers/net/wireless/libertas/wext.c 2008-09-22 03:59:55.000000000 +0530 +++ 2.6.27-rc7-new/drivers/net/wireless/libertas/wext.c 2008-09-29 12:06:55.000000000 +0530 @@ -24,10 +24,9 @@ static inline void lbs_postpone_association_work(struct lbs_private *priv) { - if (priv->surpriseremoved) - return; - cancel_delayed_work(&priv->assoc_work); - queue_delayed_work(priv->work_thread, &priv->assoc_work, HZ / 2); + if (!priv->surpriseremoved) + queue_update_delayed_work(priv->work_thread, &priv->assoc_work, + HZ / 2); } static inline void lbs_cancel_association_work(struct lbs_private *priv) diff -ruNp 2.6.27-rc7-org/fs/afs/vlocation.c 2.6.27-rc7-new/fs/afs/vlocation.c --- 2.6.27-rc7-org/fs/afs/vlocation.c 2008-09-22 03:59:55.000000000 +0530 +++ 2.6.27-rc7-new/fs/afs/vlocation.c 2008-09-29 12:06:55.000000000 +0530 @@ -557,12 +557,8 @@ static void afs_vlocation_reaper(struct if (expiry > now) { delay = (expiry - now) * HZ; _debug("delay %lu", delay); - if (!schedule_delayed_work(&afs_vlocation_reap, - delay)) { - cancel_delayed_work(&afs_vlocation_reap); - schedule_delayed_work(&afs_vlocation_reap, - delay); - } + schedule_update_delayed_work(&afs_vlocation_reap, + delay); break; } @@ -615,8 +611,7 @@ void afs_vlocation_purge(void) &afs_vlocation_update, 0); destroy_workqueue(afs_vlocation_update_worker); - cancel_delayed_work(&afs_vlocation_reap); - schedule_delayed_work(&afs_vlocation_reap, 0); + schedule_update_delayed_work(&afs_vlocation_reap, 0); } /* diff -ruNp 2.6.27-rc7-org/fs/ocfs2/cluster/heartbeat.c 2.6.27-rc7-new/fs/ocfs2/cluster/heartbeat.c --- 2.6.27-rc7-org/fs/ocfs2/cluster/heartbeat.c 2008-09-22 03:59:55.000000000 +0530 +++ 2.6.27-rc7-new/fs/ocfs2/cluster/heartbeat.c 2008-09-29 12:06:55.000000000 +0530 @@ -172,10 +172,9 @@ static void o2hb_arm_write_timeout(struc { mlog(0, "Queue write timeout for %u ms\n", O2HB_MAX_WRITE_TIMEOUT_MS); - cancel_delayed_work(®->hr_write_timeout_work); reg->hr_last_timeout_start = jiffies; - schedule_delayed_work(®->hr_write_timeout_work, - msecs_to_jiffies(O2HB_MAX_WRITE_TIMEOUT_MS)); + schedule_update_delayed_work(®->hr_write_timeout_work, + msecs_to_jiffies(O2HB_MAX_WRITE_TIMEOUT_MS)); } static void o2hb_disarm_write_timeout(struct o2hb_region *reg)