Patchwork [v3,24/30] e2fsck: check inline_data in pass1

login
register
mail settings
Submitter Theodore Ts'o
Date March 3, 2014, 10:18 p.m.
Message ID <20140303221840.GB4452@thunk.org>
Download mbox | patch
Permalink /patch/326078/
State Accepted
Headers show

Comments

Theodore Ts'o - March 3, 2014, 10:18 p.m.
On Fri, Dec 06, 2013 at 05:58:11PM +0800, Zheng Liu wrote:
> From: Zheng Liu <wenqing.lz@taobao.com>
> 
> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>

With my change to patch 11/30, the following change is needed to this
patch.

						- Ted

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Zheng Liu - March 4, 2014, 4:51 a.m.
On Mon, Mar 03, 2014 at 05:18:40PM -0500, Theodore Ts'o wrote:
> On Fri, Dec 06, 2013 at 05:58:11PM +0800, Zheng Liu wrote:
> > From: Zheng Liu <wenqing.lz@taobao.com>
> > 
> > Signed-off-by: Theodore Ts'o <tytso@mit.edu>
> > Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
> 
> With my change to patch 11/30, the following change is needed to this
> patch.
> 
> 						- Ted

Thanks for fixing this.  The patch looks good to me.
Reviewed-by: Zheng Liu <wenqing.lz@taobao.com>
                                                - Zheng

> 
> diff --git a/lib/ext2fs/dblist_dir.c b/lib/ext2fs/dblist_dir.c
> index 1e36584..2fbb772 100644
> --- a/lib/ext2fs/dblist_dir.c
> +++ b/lib/ext2fs/dblist_dir.c
> @@ -78,9 +78,7 @@ static int db_dir_proc(ext2_filsys fs, struct ext2_db_entry2 *db_info,
>  		return DBLIST_ABORT;
>  	if (inode.i_flags & EXT4_INLINE_DATA_FL) {
>  		ctx->flags = DIRENT_FLAG_INCLUDE_INLINE_DATA;
> -		ext2fs_inline_data_dir_iterate(fs, ctx->dir,
> -					       ext2fs_process_dir_block,
> -					       ctx);
> +		ret = ext2fs_inline_data_dir_iterate(fs, ctx->dir, ctx);
>  	} else {
>  		ret = ext2fs_process_dir_block(fs, &db_info->blk,
>  					       db_info->blockcnt, 0, 0,
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/lib/ext2fs/dblist_dir.c b/lib/ext2fs/dblist_dir.c
index 1e36584..2fbb772 100644
--- a/lib/ext2fs/dblist_dir.c
+++ b/lib/ext2fs/dblist_dir.c
@@ -78,9 +78,7 @@  static int db_dir_proc(ext2_filsys fs, struct ext2_db_entry2 *db_info,
 		return DBLIST_ABORT;
 	if (inode.i_flags & EXT4_INLINE_DATA_FL) {
 		ctx->flags = DIRENT_FLAG_INCLUDE_INLINE_DATA;
-		ext2fs_inline_data_dir_iterate(fs, ctx->dir,
-					       ext2fs_process_dir_block,
-					       ctx);
+		ret = ext2fs_inline_data_dir_iterate(fs, ctx->dir, ctx);
 	} else {
 		ret = ext2fs_process_dir_block(fs, &db_info->blk,
 					       db_info->blockcnt, 0, 0,