diff options
Diffstat (limited to 'fs/reiserfs/inode.c')
| -rw-r--r-- | fs/reiserfs/inode.c | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index 7ee0097004c0..fab0373ad6e3 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c | |||
| @@ -841,12 +841,12 @@ int reiserfs_get_block(struct inode *inode, sector_t block, | |||
| 841 | tail_offset); | 841 | tail_offset); |
| 842 | if (retval) { | 842 | if (retval) { |
| 843 | if (retval != -ENOSPC) | 843 | if (retval != -ENOSPC) |
| 844 | reiserfs_warning(inode->i_sb, | 844 | reiserfs_error(inode->i_sb, |
| 845 | "clm-6004", | 845 | "clm-6004", |
| 846 | "convert tail failed " | 846 | "convert tail failed " |
| 847 | "inode %lu, error %d", | 847 | "inode %lu, error %d", |
| 848 | inode->i_ino, | 848 | inode->i_ino, |
| 849 | retval); | 849 | retval); |
| 850 | if (allocated_block_nr) { | 850 | if (allocated_block_nr) { |
| 851 | /* the bitmap, the super, and the stat data == 3 */ | 851 | /* the bitmap, the super, and the stat data == 3 */ |
| 852 | if (!th) | 852 | if (!th) |
| @@ -1332,10 +1332,9 @@ void reiserfs_update_sd_size(struct reiserfs_transaction_handle *th, | |||
| 1332 | /* look for the object's stat data */ | 1332 | /* look for the object's stat data */ |
| 1333 | retval = search_item(inode->i_sb, &key, &path); | 1333 | retval = search_item(inode->i_sb, &key, &path); |
| 1334 | if (retval == IO_ERROR) { | 1334 | if (retval == IO_ERROR) { |
| 1335 | reiserfs_warning(inode->i_sb, "vs-13050", | 1335 | reiserfs_error(inode->i_sb, "vs-13050", |
| 1336 | "i/o failure occurred trying to " | 1336 | "i/o failure occurred trying to " |
| 1337 | "update %K stat data", | 1337 | "update %K stat data", &key); |
| 1338 | &key); | ||
| 1339 | return; | 1338 | return; |
| 1340 | } | 1339 | } |
| 1341 | if (retval == ITEM_NOT_FOUND) { | 1340 | if (retval == ITEM_NOT_FOUND) { |
| @@ -1424,9 +1423,9 @@ void reiserfs_read_locked_inode(struct inode *inode, | |||
| 1424 | /* look for the object's stat data */ | 1423 | /* look for the object's stat data */ |
| 1425 | retval = search_item(inode->i_sb, &key, &path_to_sd); | 1424 | retval = search_item(inode->i_sb, &key, &path_to_sd); |
| 1426 | if (retval == IO_ERROR) { | 1425 | if (retval == IO_ERROR) { |
| 1427 | reiserfs_warning(inode->i_sb, "vs-13070", | 1426 | reiserfs_error(inode->i_sb, "vs-13070", |
| 1428 | "i/o failure occurred trying to find " | 1427 | "i/o failure occurred trying to find " |
| 1429 | "stat data of %K", &key); | 1428 | "stat data of %K", &key); |
| 1430 | reiserfs_make_bad_inode(inode); | 1429 | reiserfs_make_bad_inode(inode); |
| 1431 | return; | 1430 | return; |
| 1432 | } | 1431 | } |
| @@ -1678,8 +1677,8 @@ static int reiserfs_new_directory(struct reiserfs_transaction_handle *th, | |||
| 1678 | /* look for place in the tree for new item */ | 1677 | /* look for place in the tree for new item */ |
| 1679 | retval = search_item(sb, &key, path); | 1678 | retval = search_item(sb, &key, path); |
| 1680 | if (retval == IO_ERROR) { | 1679 | if (retval == IO_ERROR) { |
| 1681 | reiserfs_warning(sb, "vs-13080", | 1680 | reiserfs_error(sb, "vs-13080", |
| 1682 | "i/o failure occurred creating new directory"); | 1681 | "i/o failure occurred creating new directory"); |
| 1683 | return -EIO; | 1682 | return -EIO; |
| 1684 | } | 1683 | } |
| 1685 | if (retval == ITEM_FOUND) { | 1684 | if (retval == ITEM_FOUND) { |
| @@ -1718,8 +1717,8 @@ static int reiserfs_new_symlink(struct reiserfs_transaction_handle *th, struct i | |||
| 1718 | /* look for place in the tree for new item */ | 1717 | /* look for place in the tree for new item */ |
| 1719 | retval = search_item(sb, &key, path); | 1718 | retval = search_item(sb, &key, path); |
| 1720 | if (retval == IO_ERROR) { | 1719 | if (retval == IO_ERROR) { |
| 1721 | reiserfs_warning(sb, "vs-13080", | 1720 | reiserfs_error(sb, "vs-13080", |
| 1722 | "i/o failure occurred creating new symlink"); | 1721 | "i/o failure occurred creating new symlink"); |
| 1723 | return -EIO; | 1722 | return -EIO; |
| 1724 | } | 1723 | } |
| 1725 | if (retval == ITEM_FOUND) { | 1724 | if (retval == ITEM_FOUND) { |
| @@ -2043,10 +2042,8 @@ static int grab_tail_page(struct inode *p_s_inode, | |||
| 2043 | ** I've screwed up the code to find the buffer, or the code to | 2042 | ** I've screwed up the code to find the buffer, or the code to |
| 2044 | ** call prepare_write | 2043 | ** call prepare_write |
| 2045 | */ | 2044 | */ |
| 2046 | reiserfs_warning(p_s_inode->i_sb, "clm-6000", | 2045 | reiserfs_error(p_s_inode->i_sb, "clm-6000", |
| 2047 | "error reading block %lu on dev %s", | 2046 | "error reading block %lu", bh->b_blocknr); |
| 2048 | bh->b_blocknr, | ||
| 2049 | reiserfs_bdevname(p_s_inode->i_sb)); | ||
| 2050 | error = -EIO; | 2047 | error = -EIO; |
| 2051 | goto unlock; | 2048 | goto unlock; |
| 2052 | } | 2049 | } |
| @@ -2088,9 +2085,9 @@ int reiserfs_truncate_file(struct inode *p_s_inode, int update_timestamps) | |||
| 2088 | // and get_block_create_0 could not find a block to read in, | 2085 | // and get_block_create_0 could not find a block to read in, |
| 2089 | // which is ok. | 2086 | // which is ok. |
| 2090 | if (error != -ENOENT) | 2087 | if (error != -ENOENT) |
| 2091 | reiserfs_warning(p_s_inode->i_sb, "clm-6001", | 2088 | reiserfs_error(p_s_inode->i_sb, "clm-6001", |
| 2092 | "grab_tail_page failed %d", | 2089 | "grab_tail_page failed %d", |
| 2093 | error); | 2090 | error); |
| 2094 | page = NULL; | 2091 | page = NULL; |
| 2095 | bh = NULL; | 2092 | bh = NULL; |
| 2096 | } | 2093 | } |