On Tue, 2007-07-10 at 23:20 -0700, Andrew Morton wrote: > On Sun, 01 Jul 2007 03:38:59 -0400 Mingming Cao <cmm@xxxxxxxxxx> wrote: > > > From: Dmitry Monakhov <dmonakhov@xxxxx> > > Subject: ext4: extent macros cleanup > > > > - Replace math equation to it's macro equivalent > > s/it's/its/;) Okay. > > > - make ext4_ext_grow_indepth() indexes/leaf correct > > hm, what was wrong with it? > Looking at the code, ext4_ext_ext_grow_indepth() implements tree growing procedure. It allocates a new index block, moves the top-level data of the tree(root or leaf blocks in i_data) into the new block, initializes the new root, creating index that points to the just created index block The original top-level data (in i_data) could be extent tree root (index block) or extents (leaf block). The current code (without the patch) treats the top-level data always be the leaf block, which is incorrect. assumes when the tree is growing the extent structure pass in is always > > @@ -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-fsdevel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html - To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
