aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs
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
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')
-rw-r--r--fs/reiserfs/bitmap.c56
-rw-r--r--fs/reiserfs/inode.c45
-rw-r--r--fs/reiserfs/lbalance.c20
-rw-r--r--fs/reiserfs/namei.c24
-rw-r--r--fs/reiserfs/objectid.c4
-rw-r--r--fs/reiserfs/stree.c26
-rw-r--r--fs/reiserfs/super.c15
-rw-r--r--fs/reiserfs/tail_conversion.c6
-rw-r--r--fs/reiserfs/xattr.c21
9 files changed, 107 insertions, 110 deletions
diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c
index 51b116103041..9fc228703ef0 100644
--- a/fs/reiserfs/bitmap.c
+++ b/fs/reiserfs/bitmap.c
@@ -64,9 +64,9 @@ int is_reusable(struct super_block *s, b_blocknr_t block, int bit_value)
64 unsigned int bmap_count = reiserfs_bmap_count(s); 64 unsigned int bmap_count = reiserfs_bmap_count(s);
65 65
66 if (block == 0 || block >= SB_BLOCK_COUNT(s)) { 66 if (block == 0 || block >= SB_BLOCK_COUNT(s)) {
67 reiserfs_warning(s, "vs-4010", 67 reiserfs_error(s, "vs-4010",
68 "block number is out of range %lu (%u)", 68 "block number is out of range %lu (%u)",
69 block, SB_BLOCK_COUNT(s)); 69 block, SB_BLOCK_COUNT(s));
70 return 0; 70 return 0;
71 } 71 }
72 72
@@ -79,30 +79,30 @@ int is_reusable(struct super_block *s, b_blocknr_t block, int bit_value)
79 b_blocknr_t bmap1 = REISERFS_SB(s)->s_sbh->b_blocknr + 1; 79 b_blocknr_t bmap1 = REISERFS_SB(s)->s_sbh->b_blocknr + 1;
80 if (block >= bmap1 && 80 if (block >= bmap1 &&
81 block <= bmap1 + bmap_count) { 81 block <= bmap1 + bmap_count) {
82 reiserfs_warning(s, "vs-4019", "bitmap block %lu(%u) " 82 reiserfs_error(s, "vs-4019", "bitmap block %lu(%u) "
83 "can't be freed or reused", 83 "can't be freed or reused",
84 block, bmap_count); 84 block, bmap_count);
85 return 0; 85 return 0;
86 } 86 }
87 } else { 87 } else {
88 if (offset == 0) { 88 if (offset == 0) {
89 reiserfs_warning(s, "vs-4020", "bitmap block %lu(%u) " 89 reiserfs_error(s, "vs-4020", "bitmap block %lu(%u) "
90 "can't be freed or reused", 90 "can't be freed or reused",
91 block, bmap_count); 91 block, bmap_count);
92 return 0; 92 return 0;
93 } 93 }
94 } 94 }
95 95
96 if (bmap >= bmap_count) { 96 if (bmap >= bmap_count) {
97 reiserfs_warning(s, "vs-4030", "bitmap for requested block " 97 reiserfs_error(s, "vs-4030", "bitmap for requested block "
98 "is out of range: block=%lu, bitmap_nr=%u", 98 "is out of range: block=%lu, bitmap_nr=%u",
99 block, bmap); 99 block, bmap);
100 return 0; 100 return 0;
101 } 101 }
102 102
103 if (bit_value == 0 && block == SB_ROOT_BLOCK(s)) { 103 if (bit_value == 0 && block == SB_ROOT_BLOCK(s)) {
104 reiserfs_warning(s, "vs-4050", "this is root block (%u), " 104 reiserfs_error(s, "vs-4050", "this is root block (%u), "
105 "it must be busy", SB_ROOT_BLOCK(s)); 105 "it must be busy", SB_ROOT_BLOCK(s));
106 return 0; 106 return 0;
107 } 107 }
108 108
@@ -153,8 +153,8 @@ static int scan_bitmap_block(struct reiserfs_transaction_handle *th,
153/* - I mean `a window of zero bits' as in description of this function - Zam. */ 153/* - I mean `a window of zero bits' as in description of this function - Zam. */
154 154
155 if (!bi) { 155 if (!bi) {
156 reiserfs_warning(s, "jdm-4055", "NULL bitmap info pointer " 156 reiserfs_error(s, "jdm-4055", "NULL bitmap info pointer "
157 "for bitmap %d", bmap_n); 157 "for bitmap %d", bmap_n);
158 return 0; 158 return 0;
159 } 159 }
160 160
@@ -399,8 +399,8 @@ static void _reiserfs_free_block(struct reiserfs_transaction_handle *th,
399 get_bit_address(s, block, &nr, &offset); 399 get_bit_address(s, block, &nr, &offset);
400 400
401 if (nr >= reiserfs_bmap_count(s)) { 401 if (nr >= reiserfs_bmap_count(s)) {
402 reiserfs_warning(s, "vs-4075", "block %lu is out of range", 402 reiserfs_error(s, "vs-4075", "block %lu is out of range",
403 block); 403 block);
404 return; 404 return;
405 } 405 }
406 406
@@ -412,8 +412,8 @@ static void _reiserfs_free_block(struct reiserfs_transaction_handle *th,
412 412
413 /* clear bit for the given block in bit map */ 413 /* clear bit for the given block in bit map */
414 if (!reiserfs_test_and_clear_le_bit(offset, bmbh->b_data)) { 414 if (!reiserfs_test_and_clear_le_bit(offset, bmbh->b_data)) {
415 reiserfs_warning(s, "vs-4080", 415 reiserfs_error(s, "vs-4080",
416 "block %lu: bit already cleared", block); 416 "block %lu: bit already cleared", block);
417 } 417 }
418 apbi[nr].free_count++; 418 apbi[nr].free_count++;
419 journal_mark_dirty(th, s, bmbh); 419 journal_mark_dirty(th, s, bmbh);
@@ -440,7 +440,7 @@ void reiserfs_free_block(struct reiserfs_transaction_handle *th,
440 return; 440 return;
441 441
442 if (block > sb_block_count(REISERFS_SB(s)->s_rs)) { 442 if (block > sb_block_count(REISERFS_SB(s)->s_rs)) {
443 reiserfs_panic(th->t_super, "bitmap-4072", 443 reiserfs_error(th->t_super, "bitmap-4072",
444 "Trying to free block outside file system " 444 "Trying to free block outside file system "
445 "boundaries (%lu > %lu)", 445 "boundaries (%lu > %lu)",
446 block, sb_block_count(REISERFS_SB(s)->s_rs)); 446 block, sb_block_count(REISERFS_SB(s)->s_rs));
@@ -472,8 +472,8 @@ static void __discard_prealloc(struct reiserfs_transaction_handle *th,
472 BUG_ON(!th->t_trans_id); 472 BUG_ON(!th->t_trans_id);
473#ifdef CONFIG_REISERFS_CHECK 473#ifdef CONFIG_REISERFS_CHECK
474 if (ei->i_prealloc_count < 0) 474 if (ei->i_prealloc_count < 0)
475 reiserfs_warning(th->t_super, "zam-4001", 475 reiserfs_error(th->t_super, "zam-4001",
476 "inode has negative prealloc blocks count."); 476 "inode has negative prealloc blocks count.");
477#endif 477#endif
478 while (ei->i_prealloc_count > 0) { 478 while (ei->i_prealloc_count > 0) {
479 reiserfs_free_prealloc_block(th, inode, ei->i_prealloc_block); 479 reiserfs_free_prealloc_block(th, inode, ei->i_prealloc_block);
@@ -509,9 +509,9 @@ void reiserfs_discard_all_prealloc(struct reiserfs_transaction_handle *th)
509 i_prealloc_list); 509 i_prealloc_list);
510#ifdef CONFIG_REISERFS_CHECK 510#ifdef CONFIG_REISERFS_CHECK
511 if (!ei->i_prealloc_count) { 511 if (!ei->i_prealloc_count) {
512 reiserfs_warning(th->t_super, "zam-4001", 512 reiserfs_error(th->t_super, "zam-4001",
513 "inode is in prealloc list but has " 513 "inode is in prealloc list but has "
514 "no preallocated blocks."); 514 "no preallocated blocks.");
515 } 515 }
516#endif 516#endif
517 __discard_prealloc(th, ei); 517 __discard_prealloc(th, ei);
@@ -1213,7 +1213,9 @@ void reiserfs_cache_bitmap_metadata(struct super_block *sb,
1213 unsigned long *cur = (unsigned long *)(bh->b_data + bh->b_size); 1213 unsigned long *cur = (unsigned long *)(bh->b_data + bh->b_size);
1214 1214
1215 /* The first bit must ALWAYS be 1 */ 1215 /* The first bit must ALWAYS be 1 */
1216 BUG_ON(!reiserfs_test_le_bit(0, (unsigned long *)bh->b_data)); 1216 if (!reiserfs_test_le_bit(0, (unsigned long *)bh->b_data))
1217 reiserfs_error(sb, "reiserfs-2025", "bitmap block %lu is "
1218 "corrupted: first bit must be 1", bh->b_blocknr);
1217 1219
1218 info->free_count = 0; 1220 info->free_count = 0;
1219 1221
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 }
diff --git a/fs/reiserfs/lbalance.c b/fs/reiserfs/lbalance.c
index 67f1d1de213d..21a171ceba1d 100644
--- a/fs/reiserfs/lbalance.c
+++ b/fs/reiserfs/lbalance.c
@@ -1291,17 +1291,17 @@ void leaf_paste_entries(struct buffer_info *bi,
1291 prev = (i != 0) ? deh_location(&(deh[i - 1])) : 0; 1291 prev = (i != 0) ? deh_location(&(deh[i - 1])) : 0;
1292 1292
1293 if (prev && prev <= deh_location(&(deh[i]))) 1293 if (prev && prev <= deh_location(&(deh[i])))
1294 reiserfs_warning(NULL, "vs-10240", 1294 reiserfs_error(sb_from_bi(bi), "vs-10240",
1295 "directory item (%h) " 1295 "directory item (%h) "
1296 "corrupted (prev %a, " 1296 "corrupted (prev %a, "
1297 "cur(%d) %a)", 1297 "cur(%d) %a)",
1298 ih, deh + i - 1, i, deh + i); 1298 ih, deh + i - 1, i, deh + i);
1299 if (next && next >= deh_location(&(deh[i]))) 1299 if (next && next >= deh_location(&(deh[i])))
1300 reiserfs_warning(NULL, "vs-10250", 1300 reiserfs_error(sb_from_bi(bi), "vs-10250",
1301 "directory item (%h) " 1301 "directory item (%h) "
1302 "corrupted (cur(%d) %a, " 1302 "corrupted (cur(%d) %a, "
1303 "next %a)", 1303 "next %a)",
1304 ih, i, deh + i, deh + i + 1); 1304 ih, i, deh + i, deh + i + 1);
1305 } 1305 }
1306 } 1306 }
1307#endif 1307#endif
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index ef41cc882bd9..3ce3f8b1690d 100644
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -120,8 +120,8 @@ int search_by_entry_key(struct super_block *sb, const struct cpu_key *key,
120 switch (retval) { 120 switch (retval) {
121 case ITEM_NOT_FOUND: 121 case ITEM_NOT_FOUND:
122 if (!PATH_LAST_POSITION(path)) { 122 if (!PATH_LAST_POSITION(path)) {
123 reiserfs_warning(sb, "vs-7000", "search_by_key " 123 reiserfs_error(sb, "vs-7000", "search_by_key "
124 "returned item position == 0"); 124 "returned item position == 0");
125 pathrelse(path); 125 pathrelse(path);
126 return IO_ERROR; 126 return IO_ERROR;
127 } 127 }
@@ -135,7 +135,7 @@ int search_by_entry_key(struct super_block *sb, const struct cpu_key *key,
135 135
136 default: 136 default:
137 pathrelse(path); 137 pathrelse(path);
138 reiserfs_warning(sb, "vs-7002", "no path to here"); 138 reiserfs_error(sb, "vs-7002", "no path to here");
139 return IO_ERROR; 139 return IO_ERROR;
140 } 140 }
141 141
@@ -298,7 +298,7 @@ static int reiserfs_find_entry(struct inode *dir, const char *name, int namelen,
298 search_by_entry_key(dir->i_sb, &key_to_search, 298 search_by_entry_key(dir->i_sb, &key_to_search,
299 path_to_entry, de); 299 path_to_entry, de);
300 if (retval == IO_ERROR) { 300 if (retval == IO_ERROR) {
301 reiserfs_warning(dir->i_sb, "zam-7001", "io error"); 301 reiserfs_error(dir->i_sb, "zam-7001", "io error");
302 return IO_ERROR; 302 return IO_ERROR;
303 } 303 }
304 304
@@ -481,9 +481,9 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th,
481 } 481 }
482 482
483 if (retval != NAME_FOUND) { 483 if (retval != NAME_FOUND) {
484 reiserfs_warning(dir->i_sb, "zam-7002", 484 reiserfs_error(dir->i_sb, "zam-7002",
485 "reiserfs_find_entry() returned " 485 "reiserfs_find_entry() returned "
486 "unexpected value (%d)", retval); 486 "unexpected value (%d)", retval);
487 } 487 }
488 488
489 return -EEXIST; 489 return -EEXIST;
@@ -899,9 +899,9 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)
899 goto end_rmdir; 899 goto end_rmdir;
900 900
901 if (inode->i_nlink != 2 && inode->i_nlink != 1) 901 if (inode->i_nlink != 2 && inode->i_nlink != 1)
902 reiserfs_warning(inode->i_sb, "reiserfs-7040", 902 reiserfs_error(inode->i_sb, "reiserfs-7040",
903 "empty directory has nlink != 2 (%d)", 903 "empty directory has nlink != 2 (%d)",
904 inode->i_nlink); 904 inode->i_nlink);
905 905
906 clear_nlink(inode); 906 clear_nlink(inode);
907 inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC; 907 inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
@@ -1494,8 +1494,8 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1494 if (reiserfs_cut_from_item 1494 if (reiserfs_cut_from_item
1495 (&th, &old_entry_path, &(old_de.de_entry_key), old_dir, NULL, 1495 (&th, &old_entry_path, &(old_de.de_entry_key), old_dir, NULL,
1496 0) < 0) 1496 0) < 0)
1497 reiserfs_warning(old_dir->i_sb, "vs-7060", 1497 reiserfs_error(old_dir->i_sb, "vs-7060",
1498 "couldn't not cut old name. Fsck later?"); 1498 "couldn't not cut old name. Fsck later?");
1499 1499
1500 old_dir->i_size -= DEH_SIZE + old_de.de_entrylen; 1500 old_dir->i_size -= DEH_SIZE + old_de.de_entrylen;
1501 1501
diff --git a/fs/reiserfs/objectid.c b/fs/reiserfs/objectid.c
index 90e4e52f857b..d2d6b5650188 100644
--- a/fs/reiserfs/objectid.c
+++ b/fs/reiserfs/objectid.c
@@ -159,8 +159,8 @@ void reiserfs_release_objectid(struct reiserfs_transaction_handle *th,
159 i += 2; 159 i += 2;
160 } 160 }
161 161
162 reiserfs_warning(s, "vs-15011", "tried to free free object id (%lu)", 162 reiserfs_error(s, "vs-15011", "tried to free free object id (%lu)",
163 (long unsigned)objectid_to_release); 163 (long unsigned)objectid_to_release);
164} 164}
165 165
166int reiserfs_convert_objectid_map_v1(struct super_block *s) 166int reiserfs_convert_objectid_map_v1(struct super_block *s)
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;
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index bfc276c8e978..fc7cb4661ee0 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -195,9 +195,8 @@ static int finish_unfinished(struct super_block *s)
195 while (!retval) { 195 while (!retval) {
196 retval = search_item(s, &max_cpu_key, &path); 196 retval = search_item(s, &max_cpu_key, &path);
197 if (retval != ITEM_NOT_FOUND) { 197 if (retval != ITEM_NOT_FOUND) {
198 reiserfs_warning(s, "vs-2140", 198 reiserfs_error(s, "vs-2140",
199 "search_by_key returned %d", 199 "search_by_key returned %d", retval);
200 retval);
201 break; 200 break;
202 } 201 }
203 202
@@ -378,9 +377,9 @@ void add_save_link(struct reiserfs_transaction_handle *th,
378 retval = search_item(inode->i_sb, &key, &path); 377 retval = search_item(inode->i_sb, &key, &path);
379 if (retval != ITEM_NOT_FOUND) { 378 if (retval != ITEM_NOT_FOUND) {
380 if (retval != -ENOSPC) 379 if (retval != -ENOSPC)
381 reiserfs_warning(inode->i_sb, "vs-2100", 380 reiserfs_error(inode->i_sb, "vs-2100",
382 "search_by_key (%K) returned %d", &key, 381 "search_by_key (%K) returned %d", &key,
383 retval); 382 retval);
384 pathrelse(&path); 383 pathrelse(&path);
385 return; 384 return;
386 } 385 }
@@ -393,8 +392,8 @@ void add_save_link(struct reiserfs_transaction_handle *th,
393 reiserfs_insert_item(th, &path, &key, &ih, NULL, (char *)&link); 392 reiserfs_insert_item(th, &path, &key, &ih, NULL, (char *)&link);
394 if (retval) { 393 if (retval) {
395 if (retval != -ENOSPC) 394 if (retval != -ENOSPC)
396 reiserfs_warning(inode->i_sb, "vs-2120", 395 reiserfs_error(inode->i_sb, "vs-2120",
397 "insert_item returned %d", retval); 396 "insert_item returned %d", retval);
398 } else { 397 } else {
399 if (truncate) 398 if (truncate)
400 REISERFS_I(inode)->i_flags |= 399 REISERFS_I(inode)->i_flags |=
diff --git a/fs/reiserfs/tail_conversion.c b/fs/reiserfs/tail_conversion.c
index f8449cb74b53..083f74435f65 100644
--- a/fs/reiserfs/tail_conversion.c
+++ b/fs/reiserfs/tail_conversion.c
@@ -48,9 +48,9 @@ int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode,
48 48
49 // FIXME: we could avoid this 49 // FIXME: we could avoid this
50 if (search_for_position_by_key(sb, &end_key, path) == POSITION_FOUND) { 50 if (search_for_position_by_key(sb, &end_key, path) == POSITION_FOUND) {
51 reiserfs_warning(sb, "PAP-14030", 51 reiserfs_error(sb, "PAP-14030",
52 "pasted or inserted byte exists in " 52 "pasted or inserted byte exists in "
53 "the tree %K. Use fsck to repair.", &end_key); 53 "the tree %K. Use fsck to repair.", &end_key);
54 pathrelse(path); 54 pathrelse(path);
55 return -EIO; 55 return -EIO;
56 } 56 }
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index d14f5c2c0e4a..bab77fe5f177 100644
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -259,8 +259,8 @@ static int __xattr_readdir(struct inode *inode, void *dirent, filldir_t filldir)
259 ih = de.de_ih; 259 ih = de.de_ih;
260 260
261 if (!is_direntry_le_ih(ih)) { 261 if (!is_direntry_le_ih(ih)) {
262 reiserfs_warning(inode->i_sb, "jdm-20000", 262 reiserfs_error(inode->i_sb, "jdm-20000",
263 "not direntry %h", ih); 263 "not direntry %h", ih);
264 break; 264 break;
265 } 265 }
266 copy_item_head(&tmp_ih, ih); 266 copy_item_head(&tmp_ih, ih);
@@ -653,15 +653,14 @@ __reiserfs_xattr_del(struct dentry *xadir, const char *name, int namelen)
653 goto out_file; 653 goto out_file;
654 654
655 if (!is_reiserfs_priv_object(dentry->d_inode)) { 655 if (!is_reiserfs_priv_object(dentry->d_inode)) {
656 reiserfs_warning(dir->i_sb, "jdm-20003", 656 reiserfs_error(dir->i_sb, "jdm-20003",
657 "OID %08x [%.*s/%.*s] doesn't have " 657 "OID %08x [%.*s/%.*s] doesn't have "
658 "priv flag set [parent is %sset].", 658 "priv flag set [parent is %sset].",
659 le32_to_cpu(INODE_PKEY(dentry->d_inode)-> 659 le32_to_cpu(INODE_PKEY(dentry->d_inode)->
660 k_objectid), xadir->d_name.len, 660 k_objectid), xadir->d_name.len,
661 xadir->d_name.name, namelen, name, 661 xadir->d_name.name, namelen, name,
662 is_reiserfs_priv_object(xadir-> 662 is_reiserfs_priv_object(xadir->d_inode) ? "" :
663 d_inode) ? "" : 663 "not ");
664 "not ");
665 dput(dentry); 664 dput(dentry);
666 return -EIO; 665 return -EIO;
667 } 666 }
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-01 09:28:18 -0400