[Ocfs2-tools-devel] [PATCH 6/9] dx_dirs: stop iteration of dir trailer initialization for I/O error

[Tao Ma]

Hi coly,

Coly Li wrote:
> Callback dir_trailer_func() may encounter malloc or I/O error, these
> errors can not return to its caller directly. This patch add a member
> 'errcode_t err' to struct trailer_ctxt, which can catch the error. By
> this fix, dir_trailer_func() can return OCFS2_EXTENT_ERROR to stop dir
> iteration immediately and can return the REAL error as well.
> 
> Thanks to Tao Ma catches this error.
> 
> Signed-off-by: Coly Li <coly.li at suse.de>
> Cc: Mark Fasheh <mfasheh at suse.com>
> Cc: Tao Ma <tao.ma at oracle.com>
> ---
>  libocfs2/dir_indexed.c |   37 +++++++++++++++++++++++++++++--------
>  1 files changed, 29 insertions(+), 8 deletions(-)
> 
> diff --git a/libocfs2/dir_indexed.c b/libocfs2/dir_indexed.c
> index 9cae3d0..5f3db95 100644
> --- a/libocfs2/dir_indexed.c
> +++ b/libocfs2/dir_indexed.c
> @@ -121,6 +121,7 @@ int ocfs2_find_max_rec_len(ocfs2_filesys *fs, char *buf)
>  struct trailer_ctxt {
>  	struct ocfs2_dx_root_block *dx_root;
>  	struct ocfs2_dinode *di;
> +	errcode_t err;
>  };
> 
>  /* make sure the space for trailer is reserved */
> @@ -170,8 +171,8 @@ static int dir_trailer_func(ocfs2_filesys *fs,
>  	struct ocfs2_dinode *di = ctxt->di;
>  	struct ocfs2_dx_root_block *dx_root = ctxt->dx_root;
>  	struct ocfs2_dir_block_trailer *trailer;
> -	int max_rec_len = 0;
> -	errcode_t ret = 0;
> +	int max_rec_len = 0, ret = 0;
> +	errcode_t err;
>  	char *blk = NULL;
> 
>  	ret = ocfs2_malloc_block(fs->fs_io, &blk);
> @@ -180,12 +181,20 @@ static int dir_trailer_func(ocfs2_filesys *fs,
> 
>  	/* here we don't trust trailer, cannot use
>  	 * ocfs2_read_dir_block() */
> -	ret = ocfs2_read_blocks(fs, blkno, 1, blk);
> -	if (ret)
> +	err = ocfs2_read_blocks(fs, blkno, 1, blk);
> +	if (err) {
> +		ctxt->err = err;
> +		ret = OCFS2_EXTENT_ERROR;
I am afraid we need to set OCFS2_EXTENT_ABORT here since there is no 
extent error actually? The same below.

Regards,
Tao