iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] reiserfs: do not ignore i/io error on readpage

Browse Source 
Reiserfs's readpage does not notice i/o errors.  This patch makes
reiserfs_readpage to return -EIO when i/o error appears.

This patch makes reiserfs to not ignore I/O error on readpage.

Signed-off-by: Qu Fuping <fs@ercist.iscas.ac.cn>
Signed-off-by: Vladimir V. Saveliev <vs@namesys.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Qu Fuping 2005-06-25 14:55:44 -07:00 committed by Linus Torvalds
parent 442ff70223
commit 6283d58e74
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/reiserfs/inode.c
View File

@ -254,6 +254,7 @@ static int _get_block_create_0 (struct inode * inode, long block,
char * p = NULL; char * p = NULL;
int chars; int chars;
int ret ; int ret ;
int result ;
int done = 0 ; int done = 0 ;
unsigned long offset ; unsigned long offset ;
@ -262,10 +263,13 @@ static int _get_block_create_0 (struct inode * inode, long block,
(loff_t)block * inode->i_sb->s_blocksize + 1, TYPE_ANY, 3); (loff_t)block * inode->i_sb->s_blocksize + 1, TYPE_ANY, 3);
research: 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); pathrelse (&path);
if (p) if (p)
kunmap(bh_result->b_page) ; kunmap(bh_result->b_page) ;
if (result == IO_ERROR)
return -EIO;
// We do not return -ENOENT if there is a hole but page is uptodate, because it means // We do not return -ENOENT if there is a hole but page is uptodate, because it means
// That there is some MMAPED data associated with it that is yet to be written to disk. // 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) ) { if ((args & GET_BLOCK_NO_HOLE) && !PageUptodate(bh_result->b_page) ) {
@ -382,8 +386,9 @@ research:
// update key to look for the next piece // update key to look for the next piece
set_cpu_key_k_offset (&key, cpu_key_k_offset (&key) + chars); 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);
// we read something from tail, even if now we got IO_ERROR if (result != POSITION_FOUND)
// i/o error most likely
break; break;
bh = get_last_bh (&path); bh = get_last_bh (&path);
ih = get_ih (&path); ih = get_ih (&path);
@ -394,6 +399,10 @@ research:
finished: finished:
pathrelse (&path); pathrelse (&path);
if (result == IO_ERROR)
return -EIO;
/* this buffer has valid data, but isn't valid for io. mapping it to /* 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 * block #0 tells the rest of reiserfs it just has a tail in it
*/ */