From patchwork Sat Jun 23 13:03:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 166761 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 77093B6FA8 for ; Sat, 23 Jun 2012 23:05:40 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SiQ0a-0001Kh-RU; Sat, 23 Jun 2012 13:04:13 +0000 Received: from a.ns.miles-group.at ([95.130.255.143] helo=radon.swed.at) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SiQ07-0001DI-2I for linux-mtd@lists.infradead.org; Sat, 23 Jun 2012 13:03:45 +0000 Received: (qmail 19457 invoked by uid 89); 23 Jun 2012 13:03:42 -0000 Received: by simscan 1.3.1 ppid: 19294, pid: 19454, t: 0.1254s scanners: attach: 1.3.1 clamav: 0.96.5/m:53 Received: from unknown (HELO localhost.localdomain) (richard@nod.at@212.62.202.73) by radon.swed.at with ESMTPA; 23 Jun 2012 13:03:42 -0000 From: Richard Weinberger To: linux-mtd@lists.infradead.org Subject: [PATCH 7/7] UBI: Fastmap: Get rid of fm_pool_mutex Date: Sat, 23 Jun 2012 15:03:22 +0200 Message-Id: <1340456602-46050-8-git-send-email-richard@nod.at> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1340456602-46050-1-git-send-email-richard@nod.at> References: <1340456602-46050-1-git-send-email-richard@nod.at> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: nyoushchenko@mvista.com, artem.bityutskiy@linux.intel.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, Heinz.Egger@linutronix.de, thomas.wucher@linutronix.de, shmulik.ladkani@gmail.com, Richard Weinberger , tglx@linutronix.de, Marius.Mazarel@ugal.ro, tim.bird@am.sony.com X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This mutex is no longer needed. Signed-off-by: Richard Weinberger --- drivers/mtd/ubi/build.c | 1 - drivers/mtd/ubi/ubi.h | 2 -- drivers/mtd/ubi/wl.c | 4 ---- 3 files changed, 0 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index 611d0c4..d00101e 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -906,7 +906,6 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, int vid_hdr_offset) mutex_init(&ubi->buf_mutex); mutex_init(&ubi->ckvol_mutex); mutex_init(&ubi->device_mutex); - mutex_init(&ubi->fm_pool_mutex); mutex_init(&ubi->fm_mutex); init_rwsem(&ubi->fm_sem); spin_lock_init(&ubi->volumes_lock); diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h index a2c1bcc..2ff1807 100644 --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h @@ -382,7 +382,6 @@ struct ubi_wl_entry; * * @fm: in-memory data structure of the currently used fastmap * @fm_pool: in-memory data structure of the fastmap pool - * @fm_pool_mutex: serializes ubi_wl_get_peb() * @fm_mutex: serializes ubi_update_fastmap() * @fm_sem: allows ubi_update_fastmap() to block EBA table changes * @fm_work: fastmap work queue @@ -486,7 +485,6 @@ struct ubi_device { struct ubi_fm_pool fm_wl_pool; struct rw_semaphore fm_sem; struct mutex fm_mutex; - struct mutex fm_pool_mutex; struct work_struct fm_work; int attached_by_scanning; diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index 4f8b06a..dc45bd3 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c @@ -609,8 +609,6 @@ int ubi_wl_get_peb(struct ubi_device *ubi) struct ubi_fm_pool *pool = &ubi->fm_pool; struct ubi_fm_pool *wl_pool = &ubi->fm_wl_pool; - mutex_lock(&ubi->fm_pool_mutex); - if (!pool->size || !wl_pool->size || pool->used == pool->size || wl_pool->used == wl_pool->size) ubi_update_fastmap(ubi); @@ -625,8 +623,6 @@ int ubi_wl_get_peb(struct ubi_device *ubi) spin_unlock(&ubi->wl_lock); } - mutex_unlock(&ubi->fm_pool_mutex); - return ret; }