aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs/stree.c
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2009-03-30 14:02:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-30 15:16:37 -0400
commit0030b64570c862f04c1550ba4a0bf7a9c128162a (patch)
tree811b8eec4a417983ad1e5b51f44194f9cc98496d /fs/reiserfs/stree.c
parent1e5e59d431038c53954fe8f0b38bee0f0ad30349 (diff)
reiserfs: use reiserfs_error()
This patch makes many paths that are currently using warnings to handle the error. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/reiserfs/stree.c')
-rw-r--r--fs/reiserfs/stree.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index 2de1e309124b..ec837a250a4f 100644
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -720,9 +720,9 @@ int search_by_key(struct super_block *p_s_sb, const struct cpu_key *p_s_key, /*
720 // make sure, that the node contents look like a node of 720 // make sure, that the node contents look like a node of
721 // certain level 721 // certain level
722 if (!is_tree_node(p_s_bh, expected_level)) { 722 if (!is_tree_node(p_s_bh, expected_level)) {
723 reiserfs_warning(p_s_sb, "vs-5150", 723 reiserfs_error(p_s_sb, "vs-5150",
724 "invalid format found in block %ld. " 724 "invalid format found in block %ld. "
725 "Fsck?", p_s_bh->b_blocknr); 725 "Fsck?", p_s_bh->b_blocknr);
726 pathrelse(p_s_search_path); 726 pathrelse(p_s_search_path);
727 return IO_ERROR; 727 return IO_ERROR;
728 } 728 }
@@ -1336,9 +1336,9 @@ void reiserfs_delete_solid_item(struct reiserfs_transaction_handle *th,
1336 while (1) { 1336 while (1) {
1337 retval = search_item(th->t_super, &cpu_key, &path); 1337 retval = search_item(th->t_super, &cpu_key, &path);
1338 if (retval == IO_ERROR) { 1338 if (retval == IO_ERROR) {
1339 reiserfs_warning(th->t_super, "vs-5350", 1339 reiserfs_error(th->t_super, "vs-5350",
1340 "i/o failure occurred trying " 1340 "i/o failure occurred trying "
1341 "to delete %K", &cpu_key); 1341 "to delete %K", &cpu_key);
1342 break; 1342 break;
1343 } 1343 }
1344 if (retval != ITEM_FOUND) { 1344 if (retval != ITEM_FOUND) {
@@ -1737,7 +1737,7 @@ static void truncate_directory(struct reiserfs_transaction_handle *th,
1737{ 1737{
1738 BUG_ON(!th->t_trans_id); 1738 BUG_ON(!th->t_trans_id);
1739 if (inode->i_nlink) 1739 if (inode->i_nlink)
1740 reiserfs_warning(inode->i_sb, "vs-5655", "link count != 0"); 1740 reiserfs_error(inode->i_sb, "vs-5655", "link count != 0");
1741 1741
1742 set_le_key_k_offset(KEY_FORMAT_3_5, INODE_PKEY(inode), DOT_OFFSET); 1742 set_le_key_k_offset(KEY_FORMAT_3_5, INODE_PKEY(inode), DOT_OFFSET);
1743 set_le_key_k_type(KEY_FORMAT_3_5, INODE_PKEY(inode), TYPE_DIRENTRY); 1743 set_le_key_k_type(KEY_FORMAT_3_5, INODE_PKEY(inode), TYPE_DIRENTRY);
@@ -1790,16 +1790,16 @@ int reiserfs_do_truncate(struct reiserfs_transaction_handle *th, struct inode *p
1790 search_for_position_by_key(p_s_inode->i_sb, &s_item_key, 1790 search_for_position_by_key(p_s_inode->i_sb, &s_item_key,
1791 &s_search_path); 1791 &s_search_path);
1792 if (retval == IO_ERROR) { 1792 if (retval == IO_ERROR) {
1793 reiserfs_warning(p_s_inode->i_sb, "vs-5657", 1793 reiserfs_error(p_s_inode->i_sb, "vs-5657",
1794 "i/o failure occurred trying to truncate %K", 1794 "i/o failure occurred trying to truncate %K",
1795 &s_item_key); 1795 &s_item_key);
1796 err = -EIO; 1796 err = -EIO;
1797 goto out; 1797 goto out;
1798 } 1798 }
1799 if (retval == POSITION_FOUND || retval == FILE_NOT_FOUND) { 1799 if (retval == POSITION_FOUND || retval == FILE_NOT_FOUND) {
1800 reiserfs_warning(p_s_inode->i_sb, "PAP-5660", 1800 reiserfs_error(p_s_inode->i_sb, "PAP-5660",
1801 "wrong result %d of search for %K", retval, 1801 "wrong result %d of search for %K", retval,
1802 &s_item_key); 1802 &s_item_key);
1803 1803
1804 err = -EIO; 1804 err = -EIO;
1805 goto out; 1805 goto out;