From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933488AbXGKU6n (ORCPT ); Wed, 11 Jul 2007 16:58:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933336AbXGKU62 (ORCPT ); Wed, 11 Jul 2007 16:58:28 -0400 Received: from mx1.redhat.com ([66.187.233.31]:60563 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933281AbXGKU61 (ORCPT ); Wed, 11 Jul 2007 16:58:27 -0400 Date: Wed, 11 Jul 2007 21:57:54 +0100 From: Alasdair G Kergon To: Andrew Morton Cc: dm-devel@redhat.com, linux-kernel@vger.kernel.org Subject: [2.6.23 PATCH 04/18] dm delay: cleanup Message-ID: <20070711205754.GV24114@agk.fab.redhat.com> Mail-Followup-To: Andrew Morton , dm-devel@redhat.com, linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i Organization: Red Hat UK Ltd. Registered in England and Wales, number 04098903. Registered Office: Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE. Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: Alasdair G Kergon Use setup_timer(). Replace semaphore with mutex. Signed-off-by: Alasdair G Kergon --- drivers/md/dm-delay.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) Index: linux/drivers/md/dm-delay.c =================================================================== --- linux.orig/drivers/md/dm-delay.c 2007-07-11 21:37:38.000000000 +0100 +++ linux/drivers/md/dm-delay.c 2007-07-11 21:37:39.000000000 +0100 @@ -20,7 +20,7 @@ struct delay_c { struct timer_list delay_timer; - struct semaphore timer_lock; + struct mutex timer_lock; struct work_struct flush_expired_bios; struct list_head delayed_bios; atomic_t may_delay; @@ -58,12 +58,12 @@ static void handle_delayed_timer(unsigne static void queue_timeout(struct delay_c *dc, unsigned long expires) { - down(&dc->timer_lock); + mutex_lock(&dc->timer_lock); if (!timer_pending(&dc->delay_timer) || expires < dc->delay_timer.expires) mod_timer(&dc->delay_timer, expires); - up(&dc->timer_lock); + mutex_unlock(&dc->timer_lock); } static void flush_bios(struct bio *bio) @@ -193,13 +193,11 @@ out: goto bad; } - init_timer(&dc->delay_timer); - dc->delay_timer.function = handle_delayed_timer; - dc->delay_timer.data = (unsigned long)dc; + setup_timer(&dc->delay_timer, handle_delayed_timer, (unsigned long)dc); INIT_WORK(&dc->flush_expired_bios, flush_expired_bios); INIT_LIST_HEAD(&dc->delayed_bios); - init_MUTEX(&dc->timer_lock); + mutex_init(&dc->timer_lock); atomic_set(&dc->may_delay, 1); ti->private = dc;