[Fwd: Re: [PATCH] ReiserFS _get_block_create_0 wrong behavior whenI/O fails]

[fs]

> --- Begin Message ---
> On Thu, Jun 16, 2005 at 02:46:59PM +0400, Vladimir Saveliev wrote:
> > 
> > Yes. reiserfs may store file page in different blocks. In this do {}
> > while loop it looks for different parts of page in the tree. If
> > search_for_position_by_key fails - one part of page is not found and
> > -EIO is to be returned.
> > 
> > > > 	    break;
> you mean the patch should be like this?
>
> Signed-off-by: Qu Fuping<fs@xxxxxxxxxxxxxxxxxx>
> diff -uNp linux-2.6.12-rc6.old/fs/reiserfs/inode.c linux-2.6.12-rc6.new/fs/reiserfs/inode.c > reiserfs_read.diff
>
> --- linux-2.6.12-rc6.old/fs/reiserfs/inode.c	2005-06-06 11:22:29.000000000 -0400
> +++ linux-2.6.12-rc6.new/fs/reiserfs/inode.c	2005-06-17 16:12:18.000000000 -0400
> @@ -254,6 +254,7 @@ static int _get_block_create_0 (struct i
>      char * p = NULL;
>      int chars;
>      int ret ;
> +    int	result ;
>      int done = 0 ;
>      unsigned long offset ;
>  
> @@ -262,7 +263,8 @@ static int _get_block_create_0 (struct i
>  		  (loff_t)block * inode->i_sb->s_blocksize + 1, TYPE_ANY, 3);
>  
>  research:
> -    if (search_for_position_by_key (inode->i_sb, &key, &path) != POSITION_FOUND) {
> +    result = search_for_position_by_key (inode->i_sb, &key, &path) ;
> +    if (result != POSITION_FOUND) {
>  	pathrelse (&path);
>          if (p)
>              kunmap(bh_result->b_page) ;
> @@ -270,7 +272,8 @@ research:
>  	// That there is some MMAPED data associated with it that is yet to be written to disk.
>  	if ((args & GET_BLOCK_NO_HOLE) && !PageUptodate(bh_result->b_page) ) {
>  	    return -ENOENT ;
> -	}
> +	}else if(result == IO_ERROR)
> +		return -EIO;
>          return 0 ;
>      }
>      
> @@ -382,7 +385,8 @@ research:
>  
>  	// update key to look for the next piece
>  	set_cpu_key_k_offset (&key, cpu_key_k_offset (&key) + chars);
> -	if (search_for_position_by_key (inode->i_sb, &key, &path) != POSITION_FOUND)
> +	result = search_for_position_by_key (inode->i_sb, &key, &path);
> +	if (result != POSITION_FOUND)
>  	    // we read something from tail, even if now we got IO_ERROR
>  	    break;
>  	bh = get_last_bh (&path);
> @@ -394,6 +398,10 @@ research:
>  
>  finished:
>      pathrelse (&path);
> +
> +    if(result == IO_ERROR)
> +	    return -EIO;
> +    
>      /* this buffer has valid data, but isn't valid for io.  mapping it to
>       * block #0 tells the rest of reiserfs it just has a tail in it
>       */
>
>
> --- End Message ---