Received: from list by lists.gnu.org with archive (Exim 4.71) id 1VgYht-0004q2-Lo for mharc-grub-devel@gnu.org; Wed, 13 Nov 2013 06:34:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33973) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgYhr-0004m3-2e for grub-devel@gnu.org; Wed, 13 Nov 2013 06:34:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VgYhp-0002aj-Ar for grub-devel@gnu.org; Wed, 13 Nov 2013 06:33:58 -0500 Received: from v6.chiark.greenend.org.uk ([2001:ba8:1e3::]:57464 helo=chiark.greenend.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgYhp-0002aE-3T for grub-devel@gnu.org; Wed, 13 Nov 2013 06:33:57 -0500 Received: from [172.20.153.9] (helo=riva.pelham.vpn.ucam.org) by chiark.greenend.org.uk (Debian Exim 4.72 #1) with esmtps (return-path cjwatson@ubuntu.com) id 1VgYhn-0004uQ-5r for grub-devel@gnu.org; Wed, 13 Nov 2013 11:33:55 +0000 Received: from ns1.pelham.vpn.ucam.org ([172.20.153.2] helo=riva.ucam.org) by riva.pelham.vpn.ucam.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1VgYhm-0007Gm-7N for grub-devel@gnu.org; Wed, 13 Nov 2013 11:33:54 +0000 Date: Wed, 13 Nov 2013 11:33:52 +0000 From: Colin Watson To: grub-devel@gnu.org Subject: [PATCH] * grub-core/fs/ext2.c (grub_ext2_read_block): Factor out common code for indirect block handling. Message-ID: <20131113113352.GK16147@riva.ucam.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:ba8:1e3:: X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Nov 2013 11:34:00 -0000 Saves 185 bytes on compressed image. --- ChangeLog | 7 ++++ grub-core/fs/ext2.c | 119 +++++++++++++++++----------------------------------- 2 files changed, 45 insertions(+), 81 deletions(-) diff --git a/ChangeLog b/ChangeLog index 716f69c..4454fd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2013-11-13 Colin Watson + * grub-core/fs/ext2.c (grub_ext2_read_block): Factor out common + code for indirect block handling. + + Saves 185 bytes on compressed image. + +2013-11-13 Colin Watson + * util/grub-editenv.c (help_filter, argp): Document how to delete the whole environment block. Reported by Dan Jacobson. Fixes Debian bug #726265. diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c index aba5cb1..5f7a2b9 100644 --- a/grub-core/fs/ext2.c +++ b/grub-core/fs/ext2.c @@ -397,9 +397,12 @@ grub_ext2_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) { struct grub_ext2_data *data = node->data; struct grub_ext2_inode *inode = &node->inode; - grub_disk_addr_t blknr = -1; unsigned int blksz = EXT2_BLOCK_SIZE (data); + grub_disk_addr_t blksz_quarter = blksz / 4; int log2_blksz = LOG2_EXT2_BLOCK_SIZE (data); + int log_perblock = log2_blksz + 9 - 2; + grub_uint32_t indir; + int shift; if (inode->flags & grub_cpu_to_le32_compile_time (EXT4_EXTENTS_FLAG)) { @@ -448,96 +451,50 @@ grub_ext2_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) return ret; } + /* Direct blocks. */ if (fileblock < INDIRECT_BLOCKS) - blknr = grub_le_to_cpu32 (inode->blocks.dir_blocks[fileblock]); + return grub_le_to_cpu32 (inode->blocks.dir_blocks[fileblock]); + fileblock -= INDIRECT_BLOCKS; /* Indirect. */ - else if (fileblock < INDIRECT_BLOCKS + blksz / 4) + if (fileblock < blksz_quarter) { - grub_uint32_t indir; - - if (grub_disk_read (data->disk, - ((grub_disk_addr_t) - grub_le_to_cpu32 (inode->blocks.indir_block)) - << log2_blksz, - (fileblock - INDIRECT_BLOCKS) * sizeof (indir), - sizeof (indir), &indir)) - return grub_errno; - - blknr = grub_le_to_cpu32 (indir); + indir = inode->blocks.indir_block; + shift = 0; + goto indirect; } + fileblock -= blksz_quarter; /* Double indirect. */ - else if (fileblock < INDIRECT_BLOCKS - + blksz / 4 * ((grub_disk_addr_t) blksz / 4 + 1)) + if (fileblock < blksz_quarter * blksz_quarter) { - int log_perblock = log2_blksz + 9 - 2; - grub_disk_addr_t rblock = fileblock - (INDIRECT_BLOCKS - + blksz / 4); - grub_uint32_t indir; - - if (grub_disk_read (data->disk, - ((grub_disk_addr_t) - grub_le_to_cpu32 (inode->blocks.double_indir_block)) - << log2_blksz, - (rblock >> log_perblock) * sizeof (indir), - sizeof (indir), &indir)) - return grub_errno; - - if (grub_disk_read (data->disk, - ((grub_disk_addr_t) - grub_le_to_cpu32 (indir)) - << log2_blksz, - (rblock & ((1 << log_perblock) - 1)) * sizeof (indir), - sizeof (indir), &indir)) - return grub_errno; - - - blknr = grub_le_to_cpu32 (indir); + indir = inode->blocks.double_indir_block; + shift = 1; + goto indirect; } - /* triple indirect. */ - else if (fileblock < INDIRECT_BLOCKS + blksz / 4 * ((grub_disk_addr_t) blksz / 4 + 1) - + ((grub_disk_addr_t) blksz / 4) * ((grub_disk_addr_t) blksz / 4) - * ((grub_disk_addr_t) blksz / 4 + 1)) + fileblock -= blksz_quarter * blksz_quarter; + /* Triple indirect. */ + if (fileblock < blksz_quarter * blksz_quarter * (blksz_quarter + 1)) { - int log_perblock = log2_blksz + 9 - 2; - grub_disk_addr_t rblock = fileblock - (INDIRECT_BLOCKS + blksz / 4 - * (blksz / 4 + 1)); - grub_uint32_t indir; - - if (grub_disk_read (data->disk, - ((grub_disk_addr_t) - grub_le_to_cpu32 (inode->blocks.triple_indir_block)) - << log2_blksz, - ((rblock >> log_perblock) >> log_perblock) - * sizeof (indir), sizeof (indir), &indir)) - return grub_errno; - - if (grub_disk_read (data->disk, - ((grub_disk_addr_t) - grub_le_to_cpu32 (indir)) - << log2_blksz, - ((rblock >> log_perblock) - & ((1 << log_perblock) - 1)) * sizeof (indir), - sizeof (indir), &indir)) - return grub_errno; - - if (grub_disk_read (data->disk, - ((grub_disk_addr_t) - grub_le_to_cpu32 (indir)) - << log2_blksz, - (rblock & ((1 << log_perblock) - 1)) - * sizeof (indir), sizeof (indir), &indir)) - return grub_errno; - - blknr = grub_le_to_cpu32 (indir); + indir = inode->blocks.triple_indir_block; + shift = 2; + goto indirect; } - else - { - grub_error (GRUB_ERR_BAD_FS, - "ext2fs doesn't support quadruple indirect blocks"); - } - - return blknr; + return grub_error (GRUB_ERR_BAD_FS, + "ext2fs doesn't support quadruple indirect blocks"); + +indirect: + do { + if (grub_disk_read (data->disk, + ((grub_disk_addr_t) grub_le_to_cpu32 (indir)) + << log2_blksz, + ((fileblock >> (log_perblock * shift)) + & ((1 << log_perblock) - 1)) + * sizeof (indir), + sizeof (indir), &indir)) + return grub_errno; + } while (shift--); + + return grub_le_to_cpu32 (indir); } /* Read LEN bytes from the file described by DATA starting with byte -- 1.8.4.3