From patchwork Thu Jan 23 19:51:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 313694 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2ED552C009A for ; Fri, 24 Jan 2014 06:52:37 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6QK6-0008Bn-VW; Thu, 23 Jan 2014 19:52:23 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6QK2-0003UJ-JI; Thu, 23 Jan 2014 19:52:18 +0000 Received: from mailrelay010.isp.belgacom.be ([195.238.6.177]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6QJv-0003RO-U4 for linux-mtd@lists.infradead.org; Thu, 23 Jan 2014 19:52:14 +0000 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AkcNAHhx4VJR8dUw/2dsb2JhbABagww4pzgDlVKBExd0glMTHCMYgQI3iAkBxwYXjQWBex2EIgSYIgGKTodKgy47 Received: from 48.213-241-81.adsl-dyn.isp.belgacom.be (HELO hplaser1) ([81.241.213.48]) by relay.skynet.be with SMTP; 23 Jan 2014 20:51:47 +0100 Date: Thu, 23 Jan 2014 20:51:47 +0100 From: Fabian Frederick To: linux-mtd@lists.infradead.org Subject: [PATCH 2/4] mtd: block2mtd: Add mutex_destroy Message-Id: <20140123205147.943d63fecf3140aa6cc76994@skynet.be> X-Mailer: Sylpheed 3.2.0beta5 (GTK+ 2.24.10; i686-pc-linux-gnu) Mime-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140123_145212_245051_3BF2C399 X-CRM114-Status: UNSURE ( 9.90 ) X-CRM114-Notice: Please train this message. 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 ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [195.238.6.177 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: akpm@linux-foundation.org, rdunlap@infradead.org, joern@lazybastard.org, linux-kernel@vger.kernel.org, ezequiel.garcia@free-electrons.com X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org mutex_destroy added on each device in block2mtd_exit and add_device failure Signed-off-by: Fabian Frederick --- drivers/mtd/devices/block2mtd.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c index 0efee5b..8071596 100644 --- a/drivers/mtd/devices/block2mtd.c +++ b/drivers/mtd/devices/block2mtd.c @@ -240,14 +240,14 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size) if (IS_ERR(bdev)) { pr_err("error: cannot open device %s\n", devname); - goto devinit_err; + goto devinit_err1; } dev->blkdev = bdev; if ((MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) || (MAJOR(bdev->bd_dev) == MTD_CHAR_MAJOR)) { pr_err("attempting to use an MTD device as a block device\n"); - goto devinit_err; + goto devinit_err1; } mutex_init(&dev->write_mutex); @@ -256,7 +256,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size) /* make the name contain the block device in */ name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname); if (!name) - goto devinit_err; + goto devinit_err2; dev->mtd.name = name; @@ -275,7 +275,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size) if (mtd_device_register(&dev->mtd, NULL, 0)) { /* Device didn't get added, so free the entry */ - goto devinit_err; + goto devinit_err2; } list_add(&dev->list, &blkmtd_device_list); pr_info("mtd%d: [%s] erase_size = %dKiB [%d]\n", @@ -284,7 +284,9 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size) dev->mtd.erasesize >> 10, dev->mtd.erasesize); return dev; -devinit_err: +devinit_err2: + mutex_destroy(&dev->write_mutex); +devinit_err1: block2mtd_free_device(dev); return NULL; } @@ -449,6 +451,7 @@ static void block2mtd_exit(void) struct block2mtd_dev *dev = list_entry(pos, typeof(*dev), list); block2mtd_sync(&dev->mtd); mtd_device_unregister(&dev->mtd); + mutex_destroy(&dev->write_mutex); pr_info("mtd%d: [%s] removed\n", dev->mtd.index, dev->mtd.name + strlen("block2mtd: "));