Skip to content

L
linux
Commit 45b03d5e authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Linus Torvalds
Browse files
Options

reiserfs: rework reiserfs_warning 

ReiserFS warnings can be somewhat inconsistent.
In some cases:
 * a unique identifier may be associated with it
 * the function name may be included
 * the device may be printed separately

This patch aims to make warnings more consistent. reiserfs_warning() prints
the device name, so printing it a second time is not required. The function
name for a warning is always helpful in debugging, so it is now automatically
inserted into the output. Hans has stated that every warning should have
a unique identifier. Some cases lack them, others really shouldn't have them.
reiserfs_warning() now expects an id associated with each message. In the
rare case where one isn't needed, "" will suffice.
Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1d889d99
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 454 additions and 426 deletions
fs/reiserfs/bitmap.c
View file @ 45b03d5e
...@@ -64,8 +64,8 @@ int is_reusable(struct super_block *s, b_blocknr_t block, int bit_value) ...@@ -64,8 +64,8 @@ int is_reusable(struct super_block *s, b_blocknr_t block, int bit_value)
unsigned int bmap_count = reiserfs_bmap_count(s); unsigned int bmap_count = reiserfs_bmap_count(s);
if (block == 0 || block >= SB_BLOCK_COUNT(s)) { if (block == 0 || block >= SB_BLOCK_COUNT(s)) {
reiserfs_warning(s, reiserfs_warning(s, "vs-4010",
"vs-4010: is_reusable: block number is out of range %lu (%u)", "block number is out of range %lu (%u)",
block, SB_BLOCK_COUNT(s)); block, SB_BLOCK_COUNT(s));
return 0; return 0;
} }
...@@ -79,30 +79,29 @@ int is_reusable(struct super_block *s, b_blocknr_t block, int bit_value) ...@@ -79,30 +79,29 @@ int is_reusable(struct super_block *s, b_blocknr_t block, int bit_value)
b_blocknr_t bmap1 = REISERFS_SB(s)->s_sbh->b_blocknr + 1; b_blocknr_t bmap1 = REISERFS_SB(s)->s_sbh->b_blocknr + 1;
if (block >= bmap1 && if (block >= bmap1 &&
block <= bmap1 + bmap_count) { block <= bmap1 + bmap_count) {
reiserfs_warning(s, "vs: 4019: is_reusable: " reiserfs_warning(s, "vs-4019", "bitmap block %lu(%u) "
"bitmap block %lu(%u) can't be freed or reused", "can't be freed or reused",
block, bmap_count); block, bmap_count);
return 0; return 0;
} }
} else { } else {
if (offset == 0) { if (offset == 0) {
reiserfs_warning(s, "vs: 4020: is_reusable: " reiserfs_warning(s, "vs-4020", "bitmap block %lu(%u) "
"bitmap block %lu(%u) can't be freed or reused", "can't be freed or reused",
block, bmap_count); block, bmap_count);
return 0; return 0;
} }
} }
if (bmap >= bmap_count) { if (bmap >= bmap_count) {
reiserfs_warning(s, reiserfs_warning(s, "vs-4030", "bitmap for requested block "
"vs-4030: is_reusable: there is no so many bitmap blocks: " "is out of range: block=%lu, bitmap_nr=%u",
"block=%lu, bitmap_nr=%u", block, bmap); block, bmap);
return 0; return 0;
} }
if (bit_value == 0 && block == SB_ROOT_BLOCK(s)) { if (bit_value == 0 && block == SB_ROOT_BLOCK(s)) {
reiserfs_warning(s, reiserfs_warning(s, "vs-4050", "this is root block (%u), "
"vs-4050: is_reusable: this is root block (%u), "
"it must be busy", SB_ROOT_BLOCK(s)); "it must be busy", SB_ROOT_BLOCK(s));
return 0; return 0;
} }
...@@ -154,8 +153,8 @@ static int scan_bitmap_block(struct reiserfs_transaction_handle *th, ...@@ -154,8 +153,8 @@ static int scan_bitmap_block(struct reiserfs_transaction_handle *th,
/* - I mean `a window of zero bits' as in description of this function - Zam. */ /* - I mean `a window of zero bits' as in description of this function - Zam. */
if (!bi) { if (!bi) {
reiserfs_warning(s, "NULL bitmap info pointer for bitmap %d", reiserfs_warning(s, "jdm-4055", "NULL bitmap info pointer "
bmap_n); "for bitmap %d", bmap_n);
return 0; return 0;
} }
...@@ -400,11 +399,8 @@ static void _reiserfs_free_block(struct reiserfs_transaction_handle *th, ...@@ -400,11 +399,8 @@ static void _reiserfs_free_block(struct reiserfs_transaction_handle *th,
get_bit_address(s, block, &nr, &offset); get_bit_address(s, block, &nr, &offset);
if (nr >= reiserfs_bmap_count(s)) { if (nr >= reiserfs_bmap_count(s)) {
reiserfs_warning(s, "vs-4075: reiserfs_free_block: " reiserfs_warning(s, "vs-4075", "block %lu is out of range",
"block %lu is out of range on %s " block);
"(nr=%u,max=%u)", block,
reiserfs_bdevname(s), nr,
reiserfs_bmap_count(s));
return; return;
} }
...@@ -416,9 +412,8 @@ static void _reiserfs_free_block(struct reiserfs_transaction_handle *th, ...@@ -416,9 +412,8 @@ static void _reiserfs_free_block(struct reiserfs_transaction_handle *th,
/* clear bit for the given block in bit map */ /* clear bit for the given block in bit map */
if (!reiserfs_test_and_clear_le_bit(offset, bmbh->b_data)) { if (!reiserfs_test_and_clear_le_bit(offset, bmbh->b_data)) {
reiserfs_warning(s, "vs-4080: reiserfs_free_block: " reiserfs_warning(s, "vs-4080",
"free_block (%s:%lu)[dev:blocknr]: bit already cleared", "block %lu: bit already cleared", block);
reiserfs_bdevname(s), block);
} }
apbi[nr].free_count++; apbi[nr].free_count++;
journal_mark_dirty(th, s, bmbh); journal_mark_dirty(th, s, bmbh);
...@@ -477,9 +472,8 @@ static void __discard_prealloc(struct reiserfs_transaction_handle *th, ...@@ -477,9 +472,8 @@ static void __discard_prealloc(struct reiserfs_transaction_handle *th,
BUG_ON(!th->t_trans_id); BUG_ON(!th->t_trans_id);
#ifdef CONFIG_REISERFS_CHECK #ifdef CONFIG_REISERFS_CHECK
if (ei->i_prealloc_count < 0) if (ei->i_prealloc_count < 0)
reiserfs_warning(th->t_super, reiserfs_warning(th->t_super, "zam-4001",
"zam-4001:%s: inode has negative prealloc blocks count.", "inode has negative prealloc blocks count.");
__func__);
#endif #endif
while (ei->i_prealloc_count > 0) { while (ei->i_prealloc_count > 0) {
reiserfs_free_prealloc_block(th, inode, ei->i_prealloc_block); reiserfs_free_prealloc_block(th, inode, ei->i_prealloc_block);
...@@ -515,9 +509,9 @@ void reiserfs_discard_all_prealloc(struct reiserfs_transaction_handle *th) ...@@ -515,9 +509,9 @@ void reiserfs_discard_all_prealloc(struct reiserfs_transaction_handle *th)
i_prealloc_list); i_prealloc_list);
#ifdef CONFIG_REISERFS_CHECK #ifdef CONFIG_REISERFS_CHECK
if (!ei->i_prealloc_count) { if (!ei->i_prealloc_count) {
reiserfs_warning(th->t_super, reiserfs_warning(th->t_super, "zam-4001",
"zam-4001:%s: inode is in prealloc list but has no preallocated blocks.", "inode is in prealloc list but has "
__func__); "no preallocated blocks.");
} }
#endif #endif
__discard_prealloc(th, ei); __discard_prealloc(th, ei);
...@@ -631,8 +625,8 @@ int reiserfs_parse_alloc_options(struct super_block *s, char *options) ...@@ -631,8 +625,8 @@ int reiserfs_parse_alloc_options(struct super_block *s, char *options)
continue; continue;
} }
reiserfs_warning(s, "zam-4001: %s : unknown option - %s", reiserfs_warning(s, "zam-4001", "unknown option - %s",
__func__, this_char); this_char);
return 1; return 1;
} }
......
fs/reiserfs/do_balan.c
View file @ 45b03d5e
...@@ -1752,15 +1752,16 @@ static void store_thrown(struct tree_balance *tb, struct buffer_head *bh) ...@@ -1752,15 +1752,16 @@ static void store_thrown(struct tree_balance *tb, struct buffer_head *bh)
int i; int i;
if (buffer_dirty(bh)) if (buffer_dirty(bh))
reiserfs_warning(tb->tb_sb, reiserfs_warning(tb->tb_sb, "reiserfs-12320",
"store_thrown deals with dirty buffer"); "called with dirty buffer");
for (i = 0; i < ARRAY_SIZE(tb->thrown); i++) for (i = 0; i < ARRAY_SIZE(tb->thrown); i++)
if (!tb->thrown[i]) { if (!tb->thrown[i]) {
tb->thrown[i] = bh; tb->thrown[i] = bh;
get_bh(bh); /* free_thrown puts this */ get_bh(bh); /* free_thrown puts this */
return; return;
} }
reiserfs_warning(tb->tb_sb, "store_thrown: too many thrown buffers"); reiserfs_warning(tb->tb_sb, "reiserfs-12321",
"too many thrown buffers");
} }
static void free_thrown(struct tree_balance *tb) static void free_thrown(struct tree_balance *tb)
...@@ -1771,8 +1772,8 @@ static void free_thrown(struct tree_balance *tb) ...@@ -1771,8 +1772,8 @@ static void free_thrown(struct tree_balance *tb)
if (tb->thrown[i]) { if (tb->thrown[i]) {
blocknr = tb->thrown[i]->b_blocknr; blocknr = tb->thrown[i]->b_blocknr;
if (buffer_dirty(tb->thrown[i])) if (buffer_dirty(tb->thrown[i]))
reiserfs_warning(tb->tb_sb, reiserfs_warning(tb->tb_sb, "reiserfs-12322",
"free_thrown deals with dirty buffer %d", "called with dirty buffer %d",
blocknr); blocknr);
brelse(tb->thrown[i]); /* incremented in store_thrown */ brelse(tb->thrown[i]); /* incremented in store_thrown */
reiserfs_free_block(tb->transaction_handle, NULL, reiserfs_free_block(tb->transaction_handle, NULL,
...@@ -1877,13 +1878,12 @@ static void check_internal_node(struct super_block *s, struct buffer_head *bh, ...@@ -1877,13 +1878,12 @@ static void check_internal_node(struct super_block *s, struct buffer_head *bh,
} }
} }
static int locked_or_not_in_tree(struct buffer_head *bh, char *which) static int locked_or_not_in_tree(struct tree_balance *tb,
struct buffer_head *bh, char *which)
{ {
if ((!buffer_journal_prepared(bh) && buffer_locked(bh)) || if ((!buffer_journal_prepared(bh) && buffer_locked(bh)) ||
!B_IS_IN_TREE(bh)) { !B_IS_IN_TREE(bh)) {
reiserfs_warning(NULL, reiserfs_warning(tb->tb_sb, "vs-12339", "%s (%b)", which, bh);
"vs-12339: locked_or_not_in_tree: %s (%b)",
which, bh);
return 1; return 1;
} }
return 0; return 0;
...@@ -1902,18 +1902,19 @@ static int check_before_balancing(struct tree_balance *tb) ...@@ -1902,18 +1902,19 @@ static int check_before_balancing(struct tree_balance *tb)
/* double check that buffers that we will modify are unlocked. (fix_nodes should already have /* double check that buffers that we will modify are unlocked. (fix_nodes should already have
prepped all of these for us). */ prepped all of these for us). */
if (tb->lnum[0]) { if (tb->lnum[0]) {
retval |= locked_or_not_in_tree(tb->L[0], "L[0]"); retval |= locked_or_not_in_tree(tb, tb->L[0], "L[0]");
retval |= locked_or_not_in_tree(tb->FL[0], "FL[0]"); retval |= locked_or_not_in_tree(tb, tb->FL[0], "FL[0]");
retval |= locked_or_not_in_tree(tb->CFL[0], "CFL[0]"); retval |= locked_or_not_in_tree(tb, tb->CFL[0], "CFL[0]");
check_leaf(tb->L[0]); check_leaf(tb->L[0]);
} }
if (tb->rnum[0]) { if (tb->rnum[0]) {
retval |= locked_or_not_in_tree(tb->R[0], "R[0]"); retval |= locked_or_not_in_tree(tb, tb->R[0], "R[0]");
retval |= locked_or_not_in_tree(tb->FR[0], "FR[0]"); retval |= locked_or_not_in_tree(tb, tb->FR[0], "FR[0]");
retval |= locked_or_not_in_tree(tb->CFR[0], "CFR[0]"); retval |= locked_or_not_in_tree(tb, tb->CFR[0], "CFR[0]");
check_leaf(tb->R[0]); check_leaf(tb->R[0]);
} }
retval |= locked_or_not_in_tree(PATH_PLAST_BUFFER(tb->tb_path), "S[0]"); retval |= locked_or_not_in_tree(tb, PATH_PLAST_BUFFER(tb->tb_path),
"S[0]");
check_leaf(PATH_PLAST_BUFFER(tb->tb_path)); check_leaf(PATH_PLAST_BUFFER(tb->tb_path));
return retval; return retval;
...@@ -1952,7 +1953,7 @@ static void check_after_balance_leaf(struct tree_balance *tb) ...@@ -1952,7 +1953,7 @@ static void check_after_balance_leaf(struct tree_balance *tb)
PATH_H_POSITION(tb->tb_path, PATH_H_POSITION(tb->tb_path,
1)))); 1))));
print_cur_tb("12223"); print_cur_tb("12223");
reiserfs_warning(tb->tb_sb, reiserfs_warning(tb->tb_sb, "reiserfs-12363",
"B_FREE_SPACE (PATH_H_PBUFFER(tb->tb_path,0)) = %d; " "B_FREE_SPACE (PATH_H_PBUFFER(tb->tb_path,0)) = %d; "
"MAX_CHILD_SIZE (%d) - dc_size( %y, %d ) [%d] = %d", "MAX_CHILD_SIZE (%d) - dc_size( %y, %d ) [%d] = %d",
left, left,
...@@ -2104,9 +2105,8 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */ ...@@ -2104,9 +2105,8 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
} }
/* if we have no real work to do */ /* if we have no real work to do */
if (!tb->insert_size[0]) { if (!tb->insert_size[0]) {
reiserfs_warning(tb->tb_sb, reiserfs_warning(tb->tb_sb, "PAP-12350",
"PAP-12350: do_balance: insert_size == 0, mode == %c", "insert_size == 0, mode == %c", flag);
flag);
unfix_nodes(tb); unfix_nodes(tb);
return; return;
} }
......
fs/reiserfs/file.c
View file @ 45b03d5e
...@@ -76,7 +76,7 @@ static int reiserfs_file_release(struct inode *inode, struct file *filp) ...@@ -76,7 +76,7 @@ static int reiserfs_file_release(struct inode *inode, struct file *filp)
* and let the admin know what is going on. * and let the admin know what is going on.
*/ */
igrab(inode); igrab(inode);
reiserfs_warning(inode->i_sb, reiserfs_warning(inode->i_sb, "clm-9001",
"pinning inode %lu because the " "pinning inode %lu because the "
"preallocation can't be freed", "preallocation can't be freed",
inode->i_ino); inode->i_ino);
......
fs/reiserfs/fix_node.c
View file @ 45b03d5e
...@@ -496,8 +496,8 @@ static int get_num_ver(int mode, struct tree_balance *tb, int h, ...@@ -496,8 +496,8 @@ static int get_num_ver(int mode, struct tree_balance *tb, int h,
snum012[needed_nodes - 1 + 3] = units; snum012[needed_nodes - 1 + 3] = units;
if (needed_nodes > 2) if (needed_nodes > 2)
reiserfs_warning(tb->tb_sb, "vs-8111: get_num_ver: " reiserfs_warning(tb->tb_sb, "vs-8111",
"split_item_position is out of boundary"); "split_item_position is out of range");
snum012[needed_nodes - 1]++; snum012[needed_nodes - 1]++;
split_item_positions[needed_nodes - 1] = i; split_item_positions[needed_nodes - 1] = i;
needed_nodes++; needed_nodes++;
...@@ -533,8 +533,8 @@ static int get_num_ver(int mode, struct tree_balance *tb, int h, ...@@ -533,8 +533,8 @@ static int get_num_ver(int mode, struct tree_balance *tb, int h,
if (vn->vn_vi[split_item_num].vi_index != TYPE_DIRENTRY && if (vn->vn_vi[split_item_num].vi_index != TYPE_DIRENTRY &&
vn->vn_vi[split_item_num].vi_index != TYPE_INDIRECT) vn->vn_vi[split_item_num].vi_index != TYPE_INDIRECT)
reiserfs_warning(tb->tb_sb, "vs-8115: get_num_ver: not " reiserfs_warning(tb->tb_sb, "vs-8115",
"directory or indirect item"); "not directory or indirect item");
} }
/* now we know S2bytes, calculate S1bytes */ /* now we know S2bytes, calculate S1bytes */
...@@ -2268,9 +2268,9 @@ static int wait_tb_buffers_until_unlocked(struct tree_balance *p_s_tb) ...@@ -2268,9 +2268,9 @@ static int wait_tb_buffers_until_unlocked(struct tree_balance *p_s_tb)
#ifdef CONFIG_REISERFS_CHECK #ifdef CONFIG_REISERFS_CHECK
repeat_counter++; repeat_counter++;
if ((repeat_counter % 10000) == 0) { if ((repeat_counter % 10000) == 0) {
reiserfs_warning(p_s_tb->tb_sb, reiserfs_warning(p_s_tb->tb_sb, "reiserfs-8200",
"wait_tb_buffers_until_released(): too many " "too many iterations waiting "
"iterations waiting for buffer to unlock " "for buffer to unlock "
"(%b)", locked); "(%b)", locked);
/* Don't loop forever. Try to recover from possible error. */ /* Don't loop forever. Try to recover from possible error. */
......
fs/reiserfs/inode.c
View file @ 45b03d5e
...@@ -842,7 +842,9 @@ int reiserfs_get_block(struct inode *inode, sector_t block, ...@@ -842,7 +842,9 @@ int reiserfs_get_block(struct inode *inode, sector_t block,
if (retval) { if (retval) {
if (retval != -ENOSPC) if (retval != -ENOSPC)
reiserfs_warning(inode->i_sb, reiserfs_warning(inode->i_sb,
"clm-6004: convert tail failed inode %lu, error %d", "clm-6004",
"convert tail failed "
"inode %lu, error %d",
inode->i_ino, inode->i_ino,
retval); retval);
if (allocated_block_nr) { if (allocated_block_nr) {
...@@ -1006,8 +1008,7 @@ int reiserfs_get_block(struct inode *inode, sector_t block, ...@@ -1006,8 +1008,7 @@ int reiserfs_get_block(struct inode *inode, sector_t block,
goto failure; goto failure;
} }
if (retval == POSITION_FOUND) { if (retval == POSITION_FOUND) {
reiserfs_warning(inode->i_sb, reiserfs_warning(inode->i_sb, "vs-825",
"vs-825: reiserfs_get_block: "
"%K should not be found", &key); "%K should not be found", &key);
retval = -EEXIST; retval = -EEXIST;
if (allocated_block_nr) if (allocated_block_nr)
...@@ -1332,9 +1333,9 @@ void reiserfs_update_sd_size(struct reiserfs_transaction_handle *th, ...@@ -1332,9 +1333,9 @@ void reiserfs_update_sd_size(struct reiserfs_transaction_handle *th,
/* look for the object's stat data */ /* look for the object's stat data */
retval = search_item(inode->i_sb, &key, &path); retval = search_item(inode->i_sb, &key, &path);
if (retval == IO_ERROR) { if (retval == IO_ERROR) {
reiserfs_warning(inode->i_sb, reiserfs_warning(inode->i_sb, "vs-13050",
"vs-13050: reiserfs_update_sd: " "i/o failure occurred trying to "
"i/o failure occurred trying to update %K stat data", "update %K stat data",
&key); &key);
return; return;
} }
...@@ -1345,9 +1346,9 @@ void reiserfs_update_sd_size(struct reiserfs_transaction_handle *th, ...@@ -1345,9 +1346,9 @@ void reiserfs_update_sd_size(struct reiserfs_transaction_handle *th,
/*reiserfs_warning (inode->i_sb, "vs-13050: reiserfs_update_sd: i_nlink == 0, stat data not found"); */ /*reiserfs_warning (inode->i_sb, "vs-13050: reiserfs_update_sd: i_nlink == 0, stat data not found"); */
return; return;
} }
reiserfs_warning(inode->i_sb, reiserfs_warning(inode->i_sb, "vs-13060",
"vs-13060: reiserfs_update_sd: " "stat data of object %k (nlink == %d) "
"stat data of object %k (nlink == %d) not found (pos %d)", "not found (pos %d)",
INODE_PKEY(inode), inode->i_nlink, INODE_PKEY(inode), inode->i_nlink,
pos); pos);
reiserfs_check_path(&path); reiserfs_check_path(&path);
...@@ -1424,10 +1425,9 @@ void reiserfs_read_locked_inode(struct inode *inode, ...@@ -1424,10 +1425,9 @@ void reiserfs_read_locked_inode(struct inode *inode,
/* look for the object's stat data */ /* look for the object's stat data */
retval = search_item(inode->i_sb, &key, &path_to_sd); retval = search_item(inode->i_sb, &key, &path_to_sd);
if (retval == IO_ERROR) { if (retval == IO_ERROR) {
reiserfs_warning(inode->i_sb, reiserfs_warning(inode->i_sb, "vs-13070",
"vs-13070: reiserfs_read_locked_inode: " "i/o failure occurred trying to find "
"i/o failure occurred trying to find stat data of %K", "stat data of %K", &key);
&key);
reiserfs_make_bad_inode(inode); reiserfs_make_bad_inode(inode);
return; return;
} }
...@@ -1457,8 +1457,7 @@ void reiserfs_read_locked_inode(struct inode *inode, ...@@ -1457,8 +1457,7 @@ void reiserfs_read_locked_inode(struct inode *inode,
during mount (fs/reiserfs/super.c:finish_unfinished()). */ during mount (fs/reiserfs/super.c:finish_unfinished()). */
if ((inode->i_nlink == 0) && if ((inode->i_nlink == 0) &&
!REISERFS_SB(inode->i_sb)->s_is_unlinked_ok) { !REISERFS_SB(inode->i_sb)->s_is_unlinked_ok) {
reiserfs_warning(inode->i_sb, reiserfs_warning(inode->i_sb, "vs-13075",
"vs-13075: reiserfs_read_locked_inode: "
"dead inode read from disk %K. " "dead inode read from disk %K. "
"This is likely to be race with knfsd. Ignore", "This is likely to be race with knfsd. Ignore",
&key); &key);
...@@ -1555,7 +1554,7 @@ struct dentry *reiserfs_fh_to_dentry(struct super_block *sb, struct fid *fid, ...@@ -1555,7 +1554,7 @@ struct dentry *reiserfs_fh_to_dentry(struct super_block *sb, struct fid *fid,
*/ */
if (fh_type > fh_len) { if (fh_type > fh_len) {
if (fh_type != 6 || fh_len != 5) if (fh_type != 6 || fh_len != 5)
reiserfs_warning(sb, reiserfs_warning(sb, "reiserfs-13077",
"nfsd/reiserfs, fhtype=%d, len=%d - odd", "nfsd/reiserfs, fhtype=%d, len=%d - odd",
fh_type, fh_len); fh_type, fh_len);
fh_type = 5; fh_type = 5;
...@@ -1680,13 +1679,13 @@ static int reiserfs_new_directory(struct reiserfs_transaction_handle *th, ...@@ -1680,13 +1679,13 @@ static int reiserfs_new_directory(struct reiserfs_transaction_handle *th,
/* look for place in the tree for new item */ /* look for place in the tree for new item */
retval = search_item(sb, &key, path); retval = search_item(sb, &key, path);
if (retval == IO_ERROR) { if (retval == IO_ERROR) {
reiserfs_warning(sb, "vs-13080: reiserfs_new_directory: " reiserfs_warning(sb, "vs-13080",
"i/o failure occurred creating new directory"); "i/o failure occurred creating new directory");
return -EIO; return -EIO;
} }
if (retval == ITEM_FOUND) { if (retval == ITEM_FOUND) {
pathrelse(path); pathrelse(path);
reiserfs_warning(sb, "vs-13070: reiserfs_new_directory: " reiserfs_warning(sb, "vs-13070",
"object with this key exists (%k)", "object with this key exists (%k)",
&(ih->ih_key)); &(ih->ih_key));
return -EEXIST; return -EEXIST;
...@@ -1720,13 +1719,13 @@ static int reiserfs_new_symlink(struct reiserfs_transaction_handle *th, struct i ...@@ -1720,13 +1719,13 @@ static int reiserfs_new_symlink(struct reiserfs_transaction_handle *th, struct i
/* look for place in the tree for new item */ /* look for place in the tree for new item */
retval = search_item(sb, &key, path); retval = search_item(sb, &key, path);
if (retval == IO_ERROR) { if (retval == IO_ERROR) {
reiserfs_warning(sb, "vs-13080: reiserfs_new_symlinik: " reiserfs_warning(sb, "vs-13080",
"i/o failure occurred creating new symlink"); "i/o failure occurred creating new symlink");
return -EIO; return -EIO;
} }
if (retval == ITEM_FOUND) { if (retval == ITEM_FOUND) {
pathrelse(path); pathrelse(path);
reiserfs_warning(sb, "vs-13080: reiserfs_new_symlink: " reiserfs_warning(sb, "vs-13080",
"object with this key exists (%k)", "object with this key exists (%k)",
&(ih->ih_key)); &(ih->ih_key));
return -EEXIST; return -EEXIST;
...@@ -1927,7 +1926,8 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th, ...@@ -1927,7 +1926,8 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
goto out_inserted_sd; goto out_inserted_sd;
} }
} else if (inode->i_sb->s_flags & MS_POSIXACL) { } else if (inode->i_sb->s_flags & MS_POSIXACL) {
reiserfs_warning(inode->i_sb, "ACLs aren't enabled in the fs, " reiserfs_warning(inode->i_sb, "jdm-13090",
"ACLs aren't enabled in the fs, "
"but vfs thinks they are!"); "but vfs thinks they are!");
} else if (is_reiserfs_priv_object(dir)) { } else if (is_reiserfs_priv_object(dir)) {
reiserfs_mark_inode_private(inode); reiserfs_mark_inode_private(inode);
...@@ -2044,8 +2044,8 @@ static int grab_tail_page(struct inode *p_s_inode, ...@@ -2044,8 +2044,8 @@ static int grab_tail_page(struct inode *p_s_inode,
** I've screwed up the code to find the buffer, or the code to ** I've screwed up the code to find the buffer, or the code to
** call prepare_write ** call prepare_write
*/ */
reiserfs_warning(p_s_inode->i_sb, reiserfs_warning(p_s_inode->i_sb, "clm-6000",
"clm-6000: error reading block %lu on dev %s", "error reading block %lu on dev %s",
bh->b_blocknr, bh->b_blocknr,
reiserfs_bdevname(p_s_inode->i_sb)); reiserfs_bdevname(p_s_inode->i_sb));
error = -EIO; error = -EIO;
...@@ -2089,8 +2089,8 @@ int reiserfs_truncate_file(struct inode *p_s_inode, int update_timestamps) ...@@ -2089,8 +2089,8 @@ int reiserfs_truncate_file(struct inode *p_s_inode, int update_timestamps)
// and get_block_create_0 could not find a block to read in, // and get_block_create_0 could not find a block to read in,
// which is ok. // which is ok.
if (error != -ENOENT) if (error != -ENOENT)
reiserfs_warning(p_s_inode->i_sb, reiserfs_warning(p_s_inode->i_sb, "clm-6001",
"clm-6001: grab_tail_page failed %d", "grab_tail_page failed %d",
error); error);
page = NULL; page = NULL;
bh = NULL; bh = NULL;
...@@ -2208,9 +2208,8 @@ static int map_block_for_writepage(struct inode *inode, ...@@ -2208,9 +2208,8 @@ static int map_block_for_writepage(struct inode *inode,
/* we've found an unformatted node */ /* we've found an unformatted node */
if (indirect_item_found(retval, ih)) { if (indirect_item_found(retval, ih)) {
if (bytes_copied > 0) { if (bytes_copied > 0) {
reiserfs_warning(inode->i_sb, reiserfs_warning(inode->i_sb, "clm-6002",
"clm-6002: bytes_copied %d", "bytes_copied %d", bytes_copied);
bytes_copied);
} }
if (!get_block_num(item, pos_in_item)) { if (!get_block_num(item, pos_in_item)) {
/* crap, we are writing to a hole */ /* crap, we are writing to a hole */
...@@ -2267,9 +2266,8 @@ static int map_block_for_writepage(struct inode *inode, ...@@ -2267,9 +2266,8 @@ static int map_block_for_writepage(struct inode *inode,
goto research; goto research;
} }
} else { } else {
reiserfs_warning(inode->i_sb, reiserfs_warning(inode->i_sb, "clm-6003",
"clm-6003: bad item inode %lu, device %s", "bad item inode %lu", inode->i_ino);
inode->i_ino, reiserfs_bdevname(inode->i_sb));
retval = -EIO; retval = -EIO;
goto out; goto out;
} }
......
fs/reiserfs/item_ops.c
View file @ 45b03d5e
...@@ -97,7 +97,8 @@ static int sd_unit_num(struct virtual_item *vi) ...@@ -97,7 +97,8 @@ static int sd_unit_num(struct virtual_item *vi)
static void sd_print_vi(struct virtual_item *vi) static void sd_print_vi(struct virtual_item *vi)
{ {
reiserfs_warning(NULL, "STATDATA, index %d, type 0x%x, %h", reiserfs_warning(NULL, "reiserfs-16100",
"STATDATA, index %d, type 0x%x, %h",
vi->vi_index, vi->vi_type, vi->vi_ih); vi->vi_index, vi->vi_type, vi->vi_ih);
} }
...@@ -190,7 +191,8 @@ static int direct_unit_num(struct virtual_item *vi) ...@@ -190,7 +191,8 @@ static int direct_unit_num(struct virtual_item *vi)
static void direct_print_vi(struct virtual_item *vi) static void direct_print_vi(struct virtual_item *vi)
{ {
reiserfs_warning(NULL, "DIRECT, index %d, type 0x%x, %h", reiserfs_warning(NULL, "reiserfs-16101",
"DIRECT, index %d, type 0x%x, %h",
vi->vi_index, vi->vi_type, vi->vi_ih); vi->vi_index, vi->vi_type, vi->vi_ih);
} }
...@@ -278,7 +280,7 @@ static void indirect_print_item(struct item_head *ih, char *item) ...@@ -278,7 +280,7 @@ static void indirect_print_item(struct item_head *ih, char *item)
unp = (__le32 *) item; unp = (__le32 *) item;
if (ih_item_len(ih) % UNFM_P_SIZE) if (ih_item_len(ih) % UNFM_P_SIZE)
reiserfs_warning(NULL, "indirect_print_item: invalid item len"); reiserfs_warning(NULL, "reiserfs-16102", "invalid item len");
printk("%d pointers\n[ ", (int)I_UNFM_NUM(ih)); printk("%d pointers\n[ ", (int)I_UNFM_NUM(ih));
for (j = 0; j < I_UNFM_NUM(ih); j++) { for (j = 0; j < I_UNFM_NUM(ih); j++) {
...@@ -334,7 +336,8 @@ static int indirect_unit_num(struct virtual_item *vi) ...@@ -334,7 +336,8 @@ static int indirect_unit_num(struct virtual_item *vi)
static void indirect_print_vi(struct virtual_item *vi) static void indirect_print_vi(struct virtual_item *vi)
{ {
reiserfs_warning(NULL, "INDIRECT, index %d, type 0x%x, %h", reiserfs_warning(NULL, "reiserfs-16103",
"INDIRECT, index %d, type 0x%x, %h",
vi->vi_index, vi->vi_type, vi->vi_ih); vi->vi_index, vi->vi_type, vi->vi_ih);
} }
...@@ -359,7 +362,7 @@ static struct item_operations indirect_ops = { ...@@ -359,7 +362,7 @@ static struct item_operations indirect_ops = {
static int direntry_bytes_number(struct item_head *ih, int block_size) static int direntry_bytes_number(struct item_head *ih, int block_size)
{ {
reiserfs_warning(NULL, "vs-16090: direntry_bytes_number: " reiserfs_warning(NULL, "vs-16090",
"bytes number is asked for direntry"); "bytes number is asked for direntry");
return 0; return 0;
} }
...@@ -614,7 +617,8 @@ static void direntry_print_vi(struct virtual_item *vi) ...@@ -614,7 +617,8 @@ static void direntry_print_vi(struct virtual_item *vi)
int i; int i;
struct direntry_uarea *dir_u = vi->vi_uarea; struct direntry_uarea *dir_u = vi->vi_uarea;
reiserfs_warning(NULL, "DIRENTRY, index %d, type 0x%x, %h, flags 0x%x", reiserfs_warning(NULL, "reiserfs-16104",
"DIRENTRY, index %d, type 0x%x, %h, flags 0x%x",
vi->vi_index, vi->vi_type, vi->vi_ih, dir_u->flags); vi->vi_index, vi->vi_type, vi->vi_ih, dir_u->flags);
printk("%d entries: ", dir_u->entry_count); printk("%d entries: ", dir_u->entry_count);
for (i = 0; i < dir_u->entry_count; i++) for (i = 0; i < dir_u->entry_count; i++)
...@@ -642,43 +646,43 @@ static struct item_operations direntry_ops = { ...@@ -642,43 +646,43 @@ static struct item_operations direntry_ops = {
// //
static int errcatch_bytes_number(struct item_head *ih, int block_size) static int errcatch_bytes_number(struct item_head *ih, int block_size)
{ {
reiserfs_warning(NULL, reiserfs_warning(NULL, "green-16001",
"green-16001: Invalid item type observed, run fsck ASAP"); "Invalid item type observed, run fsck ASAP");
return 0; return 0;
} }
static void errcatch_decrement_key(struct cpu_key *key) static void errcatch_decrement_key(struct cpu_key *key)
{ {
reiserfs_warning(NULL, reiserfs_warning(NULL, "green-16002",
"green-16002: Invalid item type observed, run fsck ASAP"); "Invalid item type observed, run fsck ASAP");
} }
static int errcatch_is_left_mergeable(struct reiserfs_key *key, static int errcatch_is_left_mergeable(struct reiserfs_key *key,
unsigned long bsize) unsigned long bsize)
{ {
reiserfs_warning(NULL, reiserfs_warning(NULL, "green-16003",
"green-16003: Invalid item type observed, run fsck ASAP"); "Invalid item type observed, run fsck ASAP");
return 0; return 0;
} }
static void errcatch_print_item(struct item_head *ih, char *item) static void errcatch_print_item(struct item_head *ih, char *item)
{ {
reiserfs_warning(NULL, reiserfs_warning(NULL, "green-16004",
"green-16004: Invalid item type observed, run fsck ASAP"); "Invalid item type observed, run fsck ASAP");
} }
static void errcatch_check_item(struct item_head *ih, char *item) static void errcatch_check_item(struct item_head *ih, char *item)
{ {
reiserfs_warning(NULL, reiserfs_warning(NULL, "green-16005",
"green-16005: Invalid item type observed, run fsck ASAP"); "Invalid item type observed, run fsck ASAP");
} }
static int errcatch_create_vi(struct virtual_node *vn, static int errcatch_create_vi(struct virtual_node *vn,
struct virtual_item *vi, struct virtual_item *vi,
int is_affected, int insert_size) int is_affected, int insert_size)
{ {
reiserfs_warning(NULL, reiserfs_warning(NULL, "green-16006",
"green-16006: Invalid item type observed, run fsck ASAP"); "Invalid item type observed, run fsck ASAP");
return 0; // We might return -1 here as well, but it won't help as create_virtual_node() from where return 0; // We might return -1 here as well, but it won't help as create_virtual_node() from where
// this operation is called from is of return type void. // this operation is called from is of return type void.
} }
...@@ -686,36 +690,36 @@ static int errcatch_create_vi(struct virtual_node *vn, ...@@ -686,36 +690,36 @@ static int errcatch_create_vi(struct virtual_node *vn,
static int errcatch_check_left(struct virtual_item *vi, int free, static int errcatch_check_left(struct virtual_item *vi, int free,
int start_skip, int end_skip) int start_skip, int end_skip)
{ {
reiserfs_warning(NULL, reiserfs_warning(NULL, "green-16007",
"green-16007: Invalid item type observed, run fsck ASAP"); "Invalid item type observed, run fsck ASAP");
return -1; return -1;
} }
static int errcatch_check_right(struct virtual_item *vi, int free) static int errcatch_check_right(struct virtual_item *vi, int free)
{ {
reiserfs_warning(NULL, reiserfs_warning(NULL, "green-16008",
"green-16008: Invalid item type observed, run fsck ASAP"); "Invalid item type observed, run fsck ASAP");
return -1; return -1;
} }
static int errcatch_part_size(struct virtual_item *vi, int first, int count) static int errcatch_part_size(struct virtual_item *vi, int first, int count)
{ {
reiserfs_warning(NULL, reiserfs_warning(NULL, "green-16009",
"green-16009: Invalid item type observed, run fsck ASAP"); "Invalid item type observed, run fsck ASAP");
return 0; return 0;
} }
static int errcatch_unit_num(struct virtual_item *vi) static int errcatch_unit_num(struct virtual_item *vi)
{ {
reiserfs_warning(NULL, reiserfs_warning(NULL, "green-16010",
"green-16010: Invalid item type observed, run fsck ASAP"); "Invalid item type observed, run fsck ASAP");
return 0; return 0;
} }
static void errcatch_print_vi(struct virtual_item *vi) static void errcatch_print_vi(struct virtual_item *vi)
{ {
reiserfs_warning(NULL, reiserfs_warning(NULL, "green-16011",
"green-16011: Invalid item type observed, run fsck ASAP"); "Invalid item type observed, run fsck ASAP");
} }
static struct item_operations errcatch_ops = { static struct item_operations errcatch_ops = {
......
fs/reiserfs/journal.c
View file @ 45b03d5e
This diff is collapsed.
fs/reiserfs/lbalance.c
View file @ 45b03d5e
...@@ -1288,12 +1288,16 @@ void leaf_paste_entries(struct buffer_info *bi, ...@@ -1288,12 +1288,16 @@ void leaf_paste_entries(struct buffer_info *bi,
prev = (i != 0) ? deh_location(&(deh[i - 1])) : 0; prev = (i != 0) ? deh_location(&(deh[i - 1])) : 0;
if (prev && prev <= deh_location(&(deh[i]))) if (prev && prev <= deh_location(&(deh[i])))
reiserfs_warning(NULL, reiserfs_warning(NULL, "vs-10240",
"vs-10240: leaf_paste_entries: directory item (%h) corrupted (prev %a, cur(%d) %a)", "directory item (%h) "
"corrupted (prev %a, "
"cur(%d) %a)",
ih, deh + i - 1, i, deh + i); ih, deh + i - 1, i, deh + i);
if (next && next >= deh_location(&(deh[i]))) if (next && next >= deh_location(&(deh[i])))
reiserfs_warning(NULL, reiserfs_warning(NULL, "vs-10250",
"vs-10250: leaf_paste_entries: directory item (%h) corrupted (cur(%d) %a, next %a)", "directory item (%h) "
"corrupted (cur(%d) %a, "
"next %a)",
ih, i, deh + i, deh + i + 1); ih, i, deh + i, deh + i + 1);
} }
} }
......
fs/reiserfs/namei.c
View file @ 45b03d5e
...@@ -120,8 +120,8 @@ int search_by_entry_key(struct super_block *sb, const struct cpu_key *key, ...@@ -120,8 +120,8 @@ int search_by_entry_key(struct super_block *sb, const struct cpu_key *key,
switch (retval) { switch (retval) {
case ITEM_NOT_FOUND: case ITEM_NOT_FOUND:
if (!PATH_LAST_POSITION(path)) { if (!PATH_LAST_POSITION(path)) {
reiserfs_warning(sb, reiserfs_warning(sb, "vs-7000", "search_by_key "
"vs-7000: search_by_entry_key: search_by_key returned item position == 0"); "returned item position == 0");
pathrelse(path); pathrelse(path);
return IO_ERROR; return IO_ERROR;
} }
...@@ -135,8 +135,7 @@ int search_by_entry_key(struct super_block *sb, const struct cpu_key *key, ...@@ -135,8 +135,7 @@ int search_by_entry_key(struct super_block *sb, const struct cpu_key *key,
default: default:
pathrelse(path); pathrelse(path);
reiserfs_warning(sb, reiserfs_warning(sb, "vs-7002", "no path to here");
"vs-7002: search_by_entry_key: no path to here");
return IO_ERROR; return IO_ERROR;
} }
...@@ -300,8 +299,7 @@ static int reiserfs_find_entry(struct inode *dir, const char *name, int namelen, ...@@ -300,8 +299,7 @@ static int reiserfs_find_entry(struct inode *dir, const char *name, int namelen,
search_by_entry_key(dir->i_sb, &key_to_search, search_by_entry_key(dir->i_sb, &key_to_search,
path_to_entry, de); path_to_entry, de);
if (retval == IO_ERROR) { if (retval == IO_ERROR) {
reiserfs_warning(dir->i_sb, "zam-7001: io error in %s", reiserfs_warning(dir->i_sb, "zam-7001", "io error");
__func__);
return IO_ERROR; return IO_ERROR;
} }
...@@ -484,10 +482,9 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th, ...@@ -484,10 +482,9 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th,
} }
if (retval != NAME_FOUND) { if (retval != NAME_FOUND) {
reiserfs_warning(dir->i_sb, reiserfs_warning(dir->i_sb, "zam-7002",
"zam-7002:%s: \"reiserfs_find_entry\" " "reiserfs_find_entry() returned "
"has returned unexpected value (%d)", "unexpected value (%d)", retval);
__func__, retval);
} }
return -EEXIST; return -EEXIST;
...@@ -498,8 +495,9 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th, ...@@ -498,8 +495,9 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th,
MAX_GENERATION_NUMBER + 1); MAX_GENERATION_NUMBER + 1);
if (gen_number > MAX_GENERATION_NUMBER) { if (gen_number > MAX_GENERATION_NUMBER) {
/* there is no free generation number */ /* there is no free generation number */
reiserfs_warning(dir->i_sb, reiserfs_warning(dir->i_sb, "reiserfs-7010",
"reiserfs_add_entry: Congratulations! we have got hash function screwed up"); "Congratulations! we have got hash function "
"screwed up");
if (buffer != small_buf) if (buffer != small_buf)
kfree(buffer); kfree(buffer);
pathrelse(&path); pathrelse(&path);
...@@ -515,10 +513,9 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th, ...@@ -515,10 +513,9 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th,
if (gen_number != 0) { /* we need to re-search for the insertion point */ if (gen_number != 0) { /* we need to re-search for the insertion point */
if (search_by_entry_key(dir->i_sb, &entry_key, &path, &de) != if (search_by_entry_key(dir->i_sb, &entry_key, &path, &de) !=
NAME_NOT_FOUND) { NAME_NOT_FOUND) {
reiserfs_warning(dir->i_sb, reiserfs_warning(dir->i_sb, "vs-7032",
"vs-7032: reiserfs_add_entry: " "entry with this key (%K) already "
"entry with this key (%K) already exists", "exists", &entry_key);
&entry_key);
if (buffer != small_buf) if (buffer != small_buf)
kfree(buffer); kfree(buffer);
...@@ -903,8 +900,9 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry) ...@@ -903,8 +900,9 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)
goto end_rmdir; goto end_rmdir;
if (inode->i_nlink != 2 && inode->i_nlink != 1) if (inode->i_nlink != 2 && inode->i_nlink != 1)
reiserfs_warning(inode->i_sb, "%s: empty directory has nlink " reiserfs_warning(inode->i_sb, "reiserfs-7040",
"!= 2 (%d)", __func__, inode->i_nlink); "empty directory has nlink != 2 (%d)",
inode->i_nlink);
clear_nlink(inode); clear_nlink(inode);
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC; inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
...@@ -980,10 +978,9 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry) ...@@ -980,10 +978,9 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)
} }
if (!inode->i_nlink) { if (!inode->i_nlink) {
reiserfs_warning(inode->i_sb, "%s: deleting nonexistent file " reiserfs_warning(inode->i_sb, "reiserfs-7042",
"(%s:%lu), %d", __func__, "deleting nonexistent file (%lu), %d",
reiserfs_bdevname(inode->i_sb), inode->i_ino, inode->i_ino, inode->i_nlink);
inode->i_nlink);
inode->i_nlink = 1; inode->i_nlink = 1;
} }
...@@ -1499,8 +1496,8 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry, ...@@ -1499,8 +1496,8 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
if (reiserfs_cut_from_item if (reiserfs_cut_from_item
(&th, &old_entry_path, &(old_de.de_entry_key), old_dir, NULL, (&th, &old_entry_path, &(old_de.de_entry_key), old_dir, NULL,
0) < 0) 0) < 0)
reiserfs_warning(old_dir->i_sb, reiserfs_warning(old_dir->i_sb, "vs-7060",
"vs-7060: reiserfs_rename: couldn't not cut old name. Fsck later?"); "couldn't not cut old name. Fsck later?");
old_dir->i_size -= DEH_SIZE + old_de.de_entrylen; old_dir->i_size -= DEH_SIZE + old_de.de_entrylen;
......
fs/reiserfs/objectid.c
View file @ 45b03d5e
...@@ -61,7 +61,7 @@ __u32 reiserfs_get_unused_objectid(struct reiserfs_transaction_handle *th) ...@@ -61,7 +61,7 @@ __u32 reiserfs_get_unused_objectid(struct reiserfs_transaction_handle *th)
/* comment needed -Hans */ /* comment needed -Hans */
unused_objectid = le32_to_cpu(map[1]); unused_objectid = le32_to_cpu(map[1]);
if (unused_objectid == U32_MAX) { if (unused_objectid == U32_MAX) {
reiserfs_warning(s, "%s: no more object ids", __func__); reiserfs_warning(s, "reiserfs-15100", "no more object ids");
reiserfs_restore_prepared_buffer(s, SB_BUFFER_WITH_SB(s)); reiserfs_restore_prepared_buffer(s, SB_BUFFER_WITH_SB(s));
return 0; return 0;
} }
...@@ -160,8 +160,7 @@ void reiserfs_release_objectid(struct reiserfs_transaction_handle *th, ...@@ -160,8 +160,7 @@ void reiserfs_release_objectid(struct reiserfs_transaction_handle *th,
i += 2; i += 2;
} }
reiserfs_warning(s, reiserfs_warning(s, "vs-15011", "tried to free free object id (%lu)",
"vs-15011: reiserfs_release_objectid: tried to free free object id (%lu)",
(long unsigned)objectid_to_release); (long unsigned)objectid_to_release);
} }
......
fs/reiserfs/prints.c
View file @ 45b03d5e
...@@ -264,14 +264,17 @@ static void prepare_error_buf(const char *fmt, va_list args) ...@@ -264,14 +264,17 @@ static void prepare_error_buf(const char *fmt, va_list args)
va_end( args );\ va_end( args );\
} }
void reiserfs_warning(struct super_block *sb, const char *fmt, ...) void __reiserfs_warning(struct super_block *sb, const char *id,
const char *function, const char *fmt, ...)
{ {
do_reiserfs_warning(fmt); do_reiserfs_warning(fmt);
if (sb) if (sb)
printk(KERN_WARNING "REISERFS warning (device %s): %s\n", printk(KERN_WARNING "REISERFS warning (device %s): %s%s%s: "
sb->s_id, error_buf); "%s\n", sb->s_id, id ? id : "", id ? " " : "",
function, error_buf);
else else
printk(KERN_WARNING "REISERFS warning: %s\n", error_buf); printk(KERN_WARNING "REISERFS warning: %s%s%s: %s\n",
id ? id : "", id ? " " : "", function, error_buf);
} }
/* No newline.. reiserfs_info calls can be followed by printk's */ /* No newline.. reiserfs_info calls can be followed by printk's */
......
fs/reiserfs/procfs.c
View file @ 45b03d5e
...@@ -503,7 +503,7 @@ int reiserfs_proc_info_init(struct super_block *sb) ...@@ -503,7 +503,7 @@ int reiserfs_proc_info_init(struct super_block *sb)
add_file(sb, "journal", show_journal); add_file(sb, "journal", show_journal);
return 0; return 0;
} }
reiserfs_warning(sb, "reiserfs: cannot create /proc/%s/%s", reiserfs_warning(sb, "cannot create /proc/%s/%s",
proc_info_root_name, b); proc_info_root_name, b);
return 1; return 1;
} }
...@@ -559,8 +559,7 @@ int reiserfs_proc_info_global_init(void) ...@@ -559,8 +559,7 @@ int reiserfs_proc_info_global_init(void)
if (proc_info_root) { if (proc_info_root) {
proc_info_root->owner = THIS_MODULE; proc_info_root->owner = THIS_MODULE;
} else { } else {
reiserfs_warning(NULL, reiserfs_warning(NULL, "cannot create /proc/%s",
"reiserfs: cannot create /proc/%s",
proc_info_root_name); proc_info_root_name);
return 1; return 1;
} }
......
fs/reiserfs/stree.c
View file @ 45b03d5e
This diff is collapsed.
fs/reiserfs/super.c
View file @ 45b03d5e
This diff is collapsed.
fs/reiserfs/tail_conversion.c
View file @ 45b03d5e
...@@ -48,9 +48,9 @@ int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode, ...@@ -48,9 +48,9 @@ int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode,
// FIXME: we could avoid this // FIXME: we could avoid this
if (search_for_position_by_key(sb, &end_key, path) == POSITION_FOUND) { if (search_for_position_by_key(sb, &end_key, path) == POSITION_FOUND) {
reiserfs_warning(sb, "PAP-14030: direct2indirect: " reiserfs_warning(sb, "PAP-14030",
"pasted or inserted byte exists in the tree %K. " "pasted or inserted byte exists in "
"Use fsck to repair.", &end_key); "the tree %K. Use fsck to repair.", &end_key);
pathrelse(path); pathrelse(path);
return -EIO; return -EIO;
} }
......
fs/reiserfs/xattr.c
View file @ 45b03d5e
...@@ -259,7 +259,8 @@ static int __xattr_readdir(struct inode *inode, void *dirent, filldir_t filldir) ...@@ -259,7 +259,8 @@ static int __xattr_readdir(struct inode *inode, void *dirent, filldir_t filldir)
ih = de.de_ih; ih = de.de_ih;
if (!is_direntry_le_ih(ih)) { if (!is_direntry_le_ih(ih)) {
reiserfs_warning(inode->i_sb, "not direntry %h", ih); reiserfs_warning(inode->i_sb, "jdm-20000",
"not direntry %h", ih);
break; break;
} }
copy_item_head(&tmp_ih, ih); copy_item_head(&tmp_ih, ih);
...@@ -598,7 +599,7 @@ reiserfs_xattr_get(const struct inode *inode, const char *name, void *buffer, ...@@ -598,7 +599,7 @@ reiserfs_xattr_get(const struct inode *inode, const char *name, void *buffer,
if (rxh->h_magic != cpu_to_le32(REISERFS_XATTR_MAGIC)) { if (rxh->h_magic != cpu_to_le32(REISERFS_XATTR_MAGIC)) {
unlock_page(page); unlock_page(page);
reiserfs_put_page(page); reiserfs_put_page(page);
reiserfs_warning(inode->i_sb, reiserfs_warning(inode->i_sb, "jdm-20001",
"Invalid magic for xattr (%s) " "Invalid magic for xattr (%s) "
"associated with %k", name, "associated with %k", name,
INODE_PKEY(inode)); INODE_PKEY(inode));
...@@ -618,7 +619,7 @@ reiserfs_xattr_get(const struct inode *inode, const char *name, void *buffer, ...@@ -618,7 +619,7 @@ reiserfs_xattr_get(const struct inode *inode, const char *name, void *buffer,
if (xattr_hash(buffer, isize - sizeof(struct reiserfs_xattr_header)) != if (xattr_hash(buffer, isize - sizeof(struct reiserfs_xattr_header)) !=
hash) { hash) {
reiserfs_warning(inode->i_sb, reiserfs_warning(inode->i_sb, "jdm-20002",
"Invalid hash for xattr (%s) associated " "Invalid hash for xattr (%s) associated "
"with %k", name, INODE_PKEY(inode)); "with %k", name, INODE_PKEY(inode));
err = -EIO; err = -EIO;
...@@ -652,7 +653,8 @@ __reiserfs_xattr_del(struct dentry *xadir, const char *name, int namelen) ...@@ -652,7 +653,8 @@ __reiserfs_xattr_del(struct dentry *xadir, const char *name, int namelen)
goto out_file; goto out_file;
if (!is_reiserfs_priv_object(dentry->d_inode)) { if (!is_reiserfs_priv_object(dentry->d_inode)) {
reiserfs_warning(dir->i_sb, "OID %08x [%.*s/%.*s] doesn't have " reiserfs_warning(dir->i_sb, "jdm-20003",
"OID %08x [%.*s/%.*s] doesn't have "
"priv flag set [parent is %sset].", "priv flag set [parent is %sset].",
le32_to_cpu(INODE_PKEY(dentry->d_inode)-> le32_to_cpu(INODE_PKEY(dentry->d_inode)->
k_objectid), xadir->d_name.len, k_objectid), xadir->d_name.len,
...@@ -750,7 +752,7 @@ int reiserfs_delete_xattrs(struct inode *inode) ...@@ -750,7 +752,7 @@ int reiserfs_delete_xattrs(struct inode *inode)
reiserfs_write_unlock_xattrs(inode->i_sb); reiserfs_write_unlock_xattrs(inode->i_sb);
dput(root); dput(root);
} else { } else {
reiserfs_warning(inode->i_sb, reiserfs_warning(inode->i_sb, "jdm-20006",
"Couldn't remove all entries in directory"); "Couldn't remove all entries in directory");
} }
unlock_kernel(); unlock_kernel();
...@@ -1154,7 +1156,8 @@ int reiserfs_xattr_init(struct super_block *s, int mount_flags) ...@@ -1154,7 +1156,8 @@ int reiserfs_xattr_init(struct super_block *s, int mount_flags)
} else if (reiserfs_xattrs_optional(s)) { } else if (reiserfs_xattrs_optional(s)) {
/* Old format filesystem, but optional xattrs have been enabled /* Old format filesystem, but optional xattrs have been enabled
* at mount time. Error out. */ * at mount time. Error out. */
reiserfs_warning(s, "xattrs/ACLs not supported on pre v3.6 " reiserfs_warning(s, "jdm-20005",
"xattrs/ACLs not supported on pre v3.6 "
"format filesystem. Failing mount."); "format filesystem. Failing mount.");
err = -EOPNOTSUPP; err = -EOPNOTSUPP;
goto error; goto error;
...@@ -1201,8 +1204,10 @@ int reiserfs_xattr_init(struct super_block *s, int mount_flags) ...@@ -1201,8 +1204,10 @@ int reiserfs_xattr_init(struct super_block *s, int mount_flags)
/* If we're read-only it just means that the dir hasn't been /* If we're read-only it just means that the dir hasn't been
* created. Not an error -- just no xattrs on the fs. We'll * created. Not an error -- just no xattrs on the fs. We'll
* check again if we go read-write */ * check again if we go read-write */
reiserfs_warning(s, "xattrs/ACLs enabled and couldn't " reiserfs_warning(s, "jdm-20006",
"find/create .reiserfs_priv. Failing mount."); "xattrs/ACLs enabled and couldn't "
"find/create .reiserfs_priv. "
"Failing mount.");
err = -EOPNOTSUPP; err = -EOPNOTSUPP;
} }
} }
......
include/linux/reiserfs_fs.h
View file @ 45b03d5e
...@@ -79,7 +79,10 @@ struct fid; ...@@ -79,7 +79,10 @@ struct fid;
*/ */
#define REISERFS_DEBUG_CODE 5 /* extra messages to help find/debug errors */ #define REISERFS_DEBUG_CODE 5 /* extra messages to help find/debug errors */
void reiserfs_warning(struct super_block *s, const char *fmt, ...); void __reiserfs_warning(struct super_block *s, const char *id,
const char *func, const char *fmt, ...);
#define reiserfs_warning(s, id, fmt, args...) \
__reiserfs_warning(s, id, __func__, fmt, ##args)
/* assertions handling */ /* assertions handling */
/** always check a condition and panic if it's false. */ /** always check a condition and panic if it's false. */
...@@ -558,7 +561,7 @@ static inline int uniqueness2type(__u32 uniqueness) ...@@ -558,7 +561,7 @@ static inline int uniqueness2type(__u32 uniqueness)
case V1_DIRENTRY_UNIQUENESS: case V1_DIRENTRY_UNIQUENESS:
return TYPE_DIRENTRY; return TYPE_DIRENTRY;
default: default:
reiserfs_warning(NULL, "vs-500: unknown uniqueness %d", reiserfs_warning(NULL, "vs-500", "unknown uniqueness %d",
uniqueness); uniqueness);
case V1_ANY_UNIQUENESS: case V1_ANY_UNIQUENESS:
return TYPE_ANY; return TYPE_ANY;
...@@ -578,7 +581,7 @@ static inline __u32 type2uniqueness(int type) ...@@ -578,7 +581,7 @@ static inline __u32 type2uniqueness(int type)
case TYPE_DIRENTRY: case TYPE_DIRENTRY:
return V1_DIRENTRY_UNIQUENESS; return V1_DIRENTRY_UNIQUENESS;
default: default:
reiserfs_warning(NULL, "vs-501: unknown type %d", type); reiserfs_warning(NULL, "vs-501", "unknown type %d", type);
case TYPE_ANY: case TYPE_ANY:
return V1_ANY_UNIQUENESS; return V1_ANY_UNIQUENESS;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7