Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933445AbaGOToN (ORCPT ); Tue, 15 Jul 2014 15:44:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11489 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933133AbaGOToL (ORCPT ); Tue, 15 Jul 2014 15:44:11 -0400 Date: Tue, 15 Jul 2014 15:43:46 -0400 (EDT) From: Mikulas Patocka X-X-Sender: mpatocka@file01.intranet.prod.int.rdu2.redhat.com To: "Alasdair G. Kergon" , Mike Snitzer , Jonathan Brassow , Edward Thornber , "Martin K. Petersen" , Jens Axboe , Christoph Hellwig cc: dm-devel@redhat.com, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org Subject: [PATCH 14/15] dm kcopyd: change mutex to spinlock In-Reply-To: Message-ID: References: User-Agent: Alpine 2.02 (LRH 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org job->lock is only taken for a finite amount of time and the process doesn't block while holding it, so change it from mutex to spinlock. This change is needed for the next patch that makes it possible to call segment_complete from an interrupt. Taking mutexes inside an interrupt is not allowed. Signed-off-by: Mikulas Patocka --- drivers/md/dm-kcopyd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: linux-3.16-rc5/drivers/md/dm-kcopyd.c =================================================================== --- linux-3.16-rc5.orig/drivers/md/dm-kcopyd.c 2014-07-15 19:20:34.000000000 +0200 +++ linux-3.16-rc5/drivers/md/dm-kcopyd.c 2014-07-15 19:24:20.000000000 +0200 @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -356,7 +356,7 @@ struct kcopyd_job { * These fields are only used if the job has been split * into more manageable parts. */ - struct mutex lock; + spinlock_t lock; atomic_t sub_jobs; sector_t progress; @@ -629,7 +629,7 @@ static void segment_complete(int read_er struct kcopyd_job *job = sub_job->master_job; struct dm_kcopyd_client *kc = job->kc; - mutex_lock(&job->lock); + spin_lock(&job->lock); /* update the error */ if (read_err) @@ -653,7 +653,7 @@ static void segment_complete(int read_er job->progress += count; } } - mutex_unlock(&job->lock); + spin_unlock(&job->lock); if (count) { int i; @@ -708,7 +708,7 @@ static void submit_job(struct kcopyd_job if (job->source.count <= SUB_JOB_SIZE) dispatch_job(job); else { - mutex_init(&job->lock); + spin_lock_init(&job->lock); job->progress = 0; split_job(job); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/