From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752254AbbLaU1q (ORCPT ); Thu, 31 Dec 2015 15:27:46 -0500 Received: from mout.web.de ([212.227.15.14]:55514 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751483AbbLaU1n (ORCPT ); Thu, 31 Dec 2015 15:27:43 -0500 Subject: [PATCH 2/3] mtd-rfd_ftl: Refactoring for move_block_contents() To: linux-mtd@lists.infradead.org, Brian Norris , David Woodhouse References: <566ABCD9.1060404@users.sourceforge.net> <56858E3A.7000706@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <56858F8E.7050307@users.sourceforge.net> Date: Thu, 31 Dec 2015 21:26:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <56858E3A.7000706@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:+NR0GbVNs918BcbvMgRkQJT1xuB0brJCqJfkpy/zsoTr3KbcE+Z SBXfXicLer7fOhN9Cg8C6fFNsBCqVnUVZWy2S8WzHmXrVqntxjkNg3fh4qBn2upfJgUMbHC jqQc2D9X0oyWnjJroxqWL/AjFrOjw0O4WPz3XB7zBLEjcTxiuHWNoyowy68zUJ5HFNJXYU3 yq3tg55BM8YlykwXLRBLg== X-UI-Out-Filterresults: notjunk:1;V01:K0:2V174JFyszk=:EYRwBrLslQ79Q4ZkIJaY7m iEiVvgLnsey7lj+1LGLaAZWPLmWSHSM6zMDUEiqVGDZ9xAKQzYJYiVaIn+Gnq9eDhXSyjhJnl XWG4t9HiVWdNUtLtHYuzGgBgrCHS1w7TmeDvAJH3P5uuoKVSJ4+xcZmpVLuy7scbX2IrWrfAD GmwLhlgSE+F5EWKp5gBupuLFYY9BQlVq5QJKLR9SAXXW/9Tc5VF93BA6zqFDJim3jDYF323TW SD7TDG1BodpZeOxlBMBkS3tj6r2N81blAv6dDpwMHspjbB1V5G6cHL9LNw016/Jlsu/QnqQHR SD3Qh8CmNHe4gK2g+NyYzmyJuL3fSpvUm2myVsgElVRpNMvfl2mHrOeVU0lbODi1Ib2sart2t 8/jCzHeMwnftOrQaeTEhFte6/PUAakyWxIKwa/Zb9gZhJaR+6DBij4WqG3EtwyEX0JJXpAKHH 1o9lA8Do9tMp5sK4t6+CxfchmBLsEEPs6tXRP8MKaVBbi1uxpjcxbCHUaaPLlVYjIHnk14aW4 a6u1CCFTn0oO+InRZyUcRP2KieTPrEy6GqTdIsezuQ0dBO+vv03Mn7Iy7i1kUp3/d4PVpuHKX 9H1CixiTHnWSJE7JBPPJUbw17okYG6nwF0H8WRLUPamc74I5p6yWBkugTX2z+De0CNRyHQN4b cpy4lNyAqUaBork0NKfNBRmmdCnvqWBuPCwAqLFuaAC0VLUJO0wbSoxx+itt/y2aeDESx465O 1UbUCEzH5vStA/SgdLpGahKetl625qerq4WwZXezhSAPJsmzDoT4UC2g4rYRwBIiCEBeXAEfl rql5BXq Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 31 Dec 2015 20:54:50 +0100 This issue was detected by using the Coccinelle software. Rename jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/mtd/rfd_ftl.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c index 2927e1b..9b59423 100644 --- a/drivers/mtd/rfd_ftl.c +++ b/drivers/mtd/rfd_ftl.c @@ -366,13 +366,13 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old sector_data = kmalloc(SECTOR_SIZE, GFP_KERNEL); if (!sector_data) { rc = -ENOMEM; - goto err3; + goto reset_reclaim; } map = kmalloc(part->header_size, GFP_KERNEL); if (!map) { rc = -ENOMEM; - goto err2; + goto free_sector; } rc = mtd_read(part->mbd.mtd, part->blocks[block_no].offset, @@ -385,8 +385,7 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old printk(KERN_ERR PREFIX "error reading '%s' at " "0x%lx\n", part->mbd.mtd->name, part->blocks[block_no].offset); - - goto err; + goto free_map; } for (i=0; idata_sectors_per_block; i++) { @@ -417,7 +416,6 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old } rc = mtd_read(part->mbd.mtd, addr, SECTOR_SIZE, &retlen, sector_data); - if (!rc && retlen != SECTOR_SIZE) rc = -EIO; @@ -425,24 +423,20 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old printk(KERN_ERR PREFIX "'%s': Unable to " "read sector for relocation\n", part->mbd.mtd->name); - - goto err; + goto free_map; } rc = rfd_ftl_writesect((struct mtd_blktrans_dev*)part, entry, sector_data); - if (rc) - goto err; + goto free_map; } - -err: +free_map: kfree(map); -err2: +free_sector: kfree(sector_data); -err3: +reset_reclaim: part->is_reclaiming = 0; - return rc; } -- 2.6.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Thu, 31 Dec 2015 20:26:54 +0000 Subject: [PATCH 2/3] mtd-rfd_ftl: Refactoring for move_block_contents() Message-Id: <56858F8E.7050307@users.sourceforge.net> List-Id: References: <566ABCD9.1060404@users.sourceforge.net> <56858E3A.7000706@users.sourceforge.net> In-Reply-To: <56858E3A.7000706@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-mtd@lists.infradead.org, Brian Norris , David Woodhouse Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: Markus Elfring Date: Thu, 31 Dec 2015 20:54:50 +0100 This issue was detected by using the Coccinelle software. Rename jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/mtd/rfd_ftl.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c index 2927e1b..9b59423 100644 --- a/drivers/mtd/rfd_ftl.c +++ b/drivers/mtd/rfd_ftl.c @@ -366,13 +366,13 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old sector_data = kmalloc(SECTOR_SIZE, GFP_KERNEL); if (!sector_data) { rc = -ENOMEM; - goto err3; + goto reset_reclaim; } map = kmalloc(part->header_size, GFP_KERNEL); if (!map) { rc = -ENOMEM; - goto err2; + goto free_sector; } rc = mtd_read(part->mbd.mtd, part->blocks[block_no].offset, @@ -385,8 +385,7 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old printk(KERN_ERR PREFIX "error reading '%s' at " "0x%lx\n", part->mbd.mtd->name, part->blocks[block_no].offset); - - goto err; + goto free_map; } for (i=0; idata_sectors_per_block; i++) { @@ -417,7 +416,6 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old } rc = mtd_read(part->mbd.mtd, addr, SECTOR_SIZE, &retlen, sector_data); - if (!rc && retlen != SECTOR_SIZE) rc = -EIO; @@ -425,24 +423,20 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old printk(KERN_ERR PREFIX "'%s': Unable to " "read sector for relocation\n", part->mbd.mtd->name); - - goto err; + goto free_map; } rc = rfd_ftl_writesect((struct mtd_blktrans_dev*)part, entry, sector_data); - if (rc) - goto err; + goto free_map; } - -err: +free_map: kfree(map); -err2: +free_sector: kfree(sector_data); -err3: +reset_reclaim: part->is_reclaiming = 0; - return rc; } -- 2.6.3