From patchwork Wed May 16 21:00:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 159760 X-Patchwork-Delegate: wd@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id C1DDAB6FB7 for ; Thu, 17 May 2012 07:01:08 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DE5292807B; Wed, 16 May 2012 23:01:05 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OUdXR9isp3hu; Wed, 16 May 2012 23:01:05 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3E53B28080; Wed, 16 May 2012 23:01:01 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D12FB28080 for ; Wed, 16 May 2012 23:00:55 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BFZoDsIgXBBi for ; Wed, 16 May 2012 23:00:49 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by theia.denx.de (Postfix) with ESMTPS id 151982807B for ; Wed, 16 May 2012 23:00:44 +0200 (CEST) Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3Vt7Mt6zZKz3hhdn; Wed, 16 May 2012 23:00:42 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id 3Vt7Mv0jTyz4KK63; Wed, 16 May 2012 23:00:43 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from smtp-auth.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.8.164]) (amavisd-new, port 10024) with ESMTP id ESH8xoJXiOw7; Wed, 16 May 2012 23:00:41 +0200 (CEST) Received: from mashiro.lan (unknown [195.140.253.167]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA; Wed, 16 May 2012 23:00:41 +0200 (CEST) From: Marek Vasut To: u-boot@lists.denx.de Date: Wed, 16 May 2012 23:00:35 +0200 Message-Id: <1337202035-6811-1-git-send-email-marex@denx.de> X-Mailer: git-send-email 1.7.10 Cc: Marek Vasut Subject: [U-Boot] [PATCH] EXT2: Indent cleanup X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Signed-off-by: Marek Vasut Cc: Wolfgang Denk --- fs/ext2/dev.c | 74 +++++++++++++++++++++++++++------------------------------ 1 file changed, 35 insertions(+), 39 deletions(-) diff --git a/fs/ext2/dev.c b/fs/ext2/dev.c index 315ff53..f8cb8b7 100644 --- a/fs/ext2/dev.c +++ b/fs/ext2/dev.c @@ -35,6 +35,7 @@ static disk_partition_t part_info; int ext2fs_set_blk_dev(block_dev_desc_t *rbdd, int part) { ext2fs_block_dev_desc = rbdd; + int ret; if (part == 0) { /* disk doesn't use partition table */ @@ -42,60 +43,53 @@ int ext2fs_set_blk_dev(block_dev_desc_t *rbdd, int part) part_info.size = rbdd->lba; part_info.blksz = rbdd->blksz; } else { - if (get_partition_info - (ext2fs_block_dev_desc, part, &part_info)) { + ret = get_partition_info(ext2fs_block_dev_desc, part, + &part_info); + if (ret) return 0; - } } + return part_info.size; } - int ext2fs_devread(int sector, int byte_offset, int byte_len, char *buf) { ALLOC_CACHE_ALIGN_BUFFER(char, sec_buf, SECTOR_SIZE); unsigned sectors; + unsigned val; - /* - * Check partition boundaries - */ - if ((sector < 0) || - ((sector + ((byte_offset + byte_len - 1) >> SECTOR_BITS)) >= - part_info.size)) { - /* errnum = ERR_OUTSIDE_PART; */ - printf(" ** %s read outside partition sector %d\n", - __func__, - sector); + /* Check partition boundaries */ + val = sector + ((byte_offset + byte_len - 1) >> SECTOR_BITS); + if ((sector < 0) || (val >= part_info.size)) { + printf("EXT2: read outside partition %d\n", sector); return 0; } - /* - * Get the read to the beginning of a partition. - */ + /* Get the read to the beginning of a partition */ sector += byte_offset >> SECTOR_BITS; byte_offset &= SECTOR_SIZE - 1; debug(" <%d, %d, %d>\n", sector, byte_offset, byte_len); if (ext2fs_block_dev_desc == NULL) { - printf(" ** %s Invalid Block Device Descriptor (NULL)\n", - __func__); + printf("EXT2: Invalid Block Device Descriptor (NULL)\n"); return 0; } if (byte_offset != 0) { /* read first part which isn't aligned with start of sector */ - if (ext2fs_block_dev_desc-> - block_read(ext2fs_block_dev_desc->dev, - part_info.start + sector, 1, - (unsigned long *) sec_buf) != 1) { - printf(" ** %s read error **\n", __func__); + val = ext2fs_block_dev_desc->block_read( + ext2fs_block_dev_desc->dev, + part_info.start + sector, 1, + (unsigned long *)sec_buf); + if (val != 1) { + printf("EXT2: read error\n"); return 0; } - memcpy(buf, sec_buf + byte_offset, - min(SECTOR_SIZE - byte_offset, byte_len)); - buf += min(SECTOR_SIZE - byte_offset, byte_len); - byte_len -= min(SECTOR_SIZE - byte_offset, byte_len); + val = min(SECTOR_SIZE - byte_offset, byte_len); + memcpy(buf, sec_buf + byte_offset, val); + buf += val; + byte_len -= val; sector++; } @@ -103,12 +97,12 @@ int ext2fs_devread(int sector, int byte_offset, int byte_len, char *buf) sectors = byte_len / SECTOR_SIZE; if (sectors > 0) { - if (ext2fs_block_dev_desc->block_read( - ext2fs_block_dev_desc->dev, - part_info.start + sector, - sectors, - (unsigned long *) buf) != sectors) { - printf(" ** %s read error - block\n", __func__); + val = ext2fs_block_dev_desc->block_read( + ext2fs_block_dev_desc->dev, + part_info.start + sector, sectors, + (unsigned long *)buf); + if (val != sectors) { + printf("EXT2: read error - block\n"); return 0; } @@ -119,14 +113,16 @@ int ext2fs_devread(int sector, int byte_offset, int byte_len, char *buf) if (byte_len != 0) { /* read rest of data which are not in whole sector */ - if (ext2fs_block_dev_desc-> - block_read(ext2fs_block_dev_desc->dev, - part_info.start + sector, 1, - (unsigned long *) sec_buf) != 1) { - printf(" ** %s read error - last part\n", __func__); + val = ext2fs_block_dev_desc->block_read( + ext2fs_block_dev_desc->dev, + part_info.start + sector, 1, + (unsigned long *)sec_buf); + if (val != 1) { + printf("EXT2: read error - last part\n"); return 0; } memcpy(buf, sec_buf, byte_len); } + return 1; }