linux-kernel - Re: [EXT4 set 9][PATCH 5/5]Extent micro cleanups

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20070710232008.599b25aa.akpm@linux-foundation.org>
Date:	Tue, 10 Jul 2007 23:20:08 -0700
From:	Andrew Morton <akpm@...ux-foundation.org>
To:	cmm@...ibm.com
Cc:	linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org,
	linux-ext4@...r.kernel.org
Subject: Re: [EXT4 set 9][PATCH 5/5]Extent micro cleanups

On Sun, 01 Jul 2007 03:38:59 -0400 Mingming Cao <cmm@...ibm.com> wrote:

> From: Dmitry Monakhov <dmonakhov@...ru>
> Subject: ext4: extent macros cleanup
> 
> - Replace math equation to it's macro equivalent

s/it's/its/;)

> - make ext4_ext_grow_indepth() indexes/leaf correct

hm, what was wrong with it?

> Signed-off-by: Dmitry Monakhov <dmonakhov@...nvz.org>
> Acked-by: Alex Tomas <alex@...sterfs.com>
> Signed-off-by: Dave Kleikamp <shaggy@...ux.vnet.ibm.com>
> ---
>  fs/ext4/extents.c |   11 +++++++----
>  1 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
> index 12fe3d7..1fd00ac 100644
> --- a/fs/ext4/extents.c
> +++ b/fs/ext4/extents.c
> @@ -375,7 +375,7 @@ ext4_ext_binsearch_idx(struct inode *inode, struct ext4_ext_path *path, int bloc
>  	ext_debug("binsearch for %d(idx):  ", block);
> 
>  	l = EXT_FIRST_INDEX(eh) + 1;
> -	r = EXT_FIRST_INDEX(eh) + le16_to_cpu(eh->eh_entries) - 1;
> +	r = EXT_LAST_INDEX(eh);
>  	while (l <= r) {
>  		m = l + (r - l) / 2;
>  		if (block < le32_to_cpu(m->ei_block))
> @@ -440,7 +440,7 @@ ext4_ext_binsearch(struct inode *inode, struct ext4_ext_path *path, int block)
>  	ext_debug("binsearch for %d:  ", block);
> 
>  	l = EXT_FIRST_EXTENT(eh) + 1;
> -	r = EXT_FIRST_EXTENT(eh) + le16_to_cpu(eh->eh_entries) - 1;
> +	r = EXT_LAST_EXTENT(eh);
> 
>  	while (l <= r) {
>  		m = l + (r - l) / 2;
> @@ -922,8 +922,11 @@ static int ext4_ext_grow_indepth(handle_t *handle, struct inode *inode,
>  	curp->p_hdr->eh_max = cpu_to_le16(ext4_ext_space_root_idx(inode));
>  	curp->p_hdr->eh_entries = cpu_to_le16(1);
>  	curp->p_idx = EXT_FIRST_INDEX(curp->p_hdr);
> -	/* FIXME: it works, but actually path[0] can be index */
> -	curp->p_idx->ei_block = EXT_FIRST_EXTENT(path[0].p_hdr)->ee_block;
> +	
> +	if (path[0].p_hdr->eh_depth)
> +	  curp->p_idx->ei_block = EXT_FIRST_INDEX(path[0].p_hdr)->ei_block;
> +	else
> +	  curp->p_idx->ei_block = EXT_FIRST_EXTENT(path[0].p_hdr)->ee_block;

whitespace bustage there.


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/