hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs: remove stale newlines from log messages 

I've noticed an extra line after "use no compression", but search
revealed much more in messages of more critical levels and rare errors.

Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
David Sterba 2014-05-15 16:48:20 +02:00 committed by Chris Mason
parent 7d78874273
commit 351fd35321
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/extent-tree.c
View File

@ -5932,7 +5932,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
refs = btrfs_extent_refs(leaf, ei); refs = btrfs_extent_refs(leaf, ei);
if (refs < refs_to_drop) { if (refs < refs_to_drop) {
btrfs_err(info, "trying to drop %d refs but we only have %Lu " btrfs_err(info, "trying to drop %d refs but we only have %Lu "
"for bytenr %Lu\n", refs_to_drop, refs, bytenr); "for bytenr %Lu", refs_to_drop, refs, bytenr);
ret = -EINVAL; ret = -EINVAL;
btrfs_abort_transaction(trans, extent_root, ret); btrfs_abort_transaction(trans, extent_root, ret);
goto out; goto out;

4
fs/btrfs/inode.c
View File

@ -3475,7 +3475,7 @@ cache_acl:
ret = btrfs_load_inode_props(inode, path); ret = btrfs_load_inode_props(inode, path);
if (ret) if (ret)
btrfs_err(root->fs_info, btrfs_err(root->fs_info,
"error loading props for ino %llu (root %llu): %d\n", "error loading props for ino %llu (root %llu): %d",
btrfs_ino(inode), btrfs_ino(inode),
root->root_key.objectid, ret); root->root_key.objectid, ret);
} }
@ -8010,7 +8010,7 @@ int btrfs_create_subvol_root(struct btrfs_trans_handle *trans,
err = btrfs_subvol_inherit_props(trans, new_root, parent_root); err = btrfs_subvol_inherit_props(trans, new_root, parent_root);
if (err) if (err)
btrfs_err(new_root->fs_info, btrfs_err(new_root->fs_info,
"error inheriting subvolume %llu properties: %d\n", "error inheriting subvolume %llu properties: %d",
new_root->root_key.objectid, err); new_root->root_key.objectid, err);
err = btrfs_update_inode(trans, new_root, inode); err = btrfs_update_inode(trans, new_root, inode);

2
fs/btrfs/ordered-data.c
View File

@ -67,7 +67,7 @@ static void ordered_data_tree_panic(struct inode *inode, int errno,
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
btrfs_panic(fs_info, errno, "Inconsistency in ordered tree at offset " btrfs_panic(fs_info, errno, "Inconsistency in ordered tree at offset "
"%llu\n", offset); "%llu", offset);
} }
/* /*

4
fs/btrfs/relocation.c
View File

@ -337,7 +337,7 @@ static void backref_tree_panic(struct rb_node *rb_node, int errno, u64 bytenr)
if (bnode->root) if (bnode->root)
fs_info = bnode->root->fs_info; fs_info = bnode->root->fs_info;
btrfs_panic(fs_info, errno, "Inconsistency in backref cache " btrfs_panic(fs_info, errno, "Inconsistency in backref cache "
"found at offset %llu\n", bytenr); "found at offset %llu", bytenr);
} }
/* /*
@ -1259,7 +1259,7 @@ static int __must_check __add_reloc_root(struct btrfs_root *root)
if (rb_node) { if (rb_node) {
btrfs_panic(root->fs_info, -EEXIST, "Duplicate root found " btrfs_panic(root->fs_info, -EEXIST, "Duplicate root found "
"for start=%llu while inserting into relocation " "for start=%llu while inserting into relocation "
"tree\n", node->bytenr); "tree", node->bytenr);
kfree(node); kfree(node);
return -EEXIST; return -EEXIST;
} }

4
fs/btrfs/send.c
View File

@ -1349,7 +1349,7 @@ static int find_extent_clone(struct send_ctx *sctx,
ret = -EIO; ret = -EIO;
btrfs_err(sctx->send_root->fs_info, "did not find backref in " btrfs_err(sctx->send_root->fs_info, "did not find backref in "
"send_root. inode=%llu, offset=%llu, " "send_root. inode=%llu, offset=%llu, "
"disk_byte=%llu found extent=%llu\n", "disk_byte=%llu found extent=%llu",
ino, data_offset, disk_byte, found_key.objectid); ino, data_offset, disk_byte, found_key.objectid);
goto out; goto out;
} }
@ -5472,7 +5472,7 @@ static void btrfs_root_dec_send_in_progress(struct btrfs_root* root)
*/ */
if (root->send_in_progress < 0) if (root->send_in_progress < 0)
btrfs_err(root->fs_info, btrfs_err(root->fs_info,
"send_in_progres unbalanced %d root %llu\n", "send_in_progres unbalanced %d root %llu",
root->send_in_progress, root->root_key.objectid); root->send_in_progress, root->root_key.objectid);
spin_unlock(&root->root_item_lock); spin_unlock(&root->root_item_lock);
} }

2
fs/btrfs/super.c
View File

@ -511,7 +511,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
} else if (compress) { } else if (compress) {
if (!btrfs_test_opt(root, COMPRESS)) if (!btrfs_test_opt(root, COMPRESS))
btrfs_info(root->fs_info, btrfs_info(root->fs_info,
"btrfs: use %s compression\n", "btrfs: use %s compression",
compress_type); compress_type);
} }
break; break;

10
fs/btrfs/volumes.c
View File

@ -4133,7 +4133,7 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
if (!devs_max) if (!devs_max)
devs_max = BTRFS_MAX_DEVS_SYS_CHUNK; devs_max = BTRFS_MAX_DEVS_SYS_CHUNK;
} else { } else {
btrfs_err(info, "invalid chunk type 0x%llx requested\n", btrfs_err(info, "invalid chunk type 0x%llx requested",
type); type);
BUG_ON(1); BUG_ON(1);
} }
@ -4381,7 +4381,7 @@ int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
if (em->start != chunk_offset || em->len != chunk_size) { if (em->start != chunk_offset || em->len != chunk_size) {
btrfs_crit(extent_root->fs_info, "found a bad mapping, wanted" btrfs_crit(extent_root->fs_info, "found a bad mapping, wanted"
" %Lu-%Lu, found %Lu-%Lu\n", chunk_offset, " %Lu-%Lu, found %Lu-%Lu", chunk_offset,
chunk_size, em->start, em->len); chunk_size, em->start, em->len);
free_extent_map(em); free_extent_map(em);
return -EINVAL; return -EINVAL;
@ -4583,14 +4583,14 @@ int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len)
* and exit, so return 1 so the callers don't try to use other copies. * and exit, so return 1 so the callers don't try to use other copies.
*/ */
if (!em) { if (!em) {
btrfs_crit(fs_info, "No mapping for %Lu-%Lu\n", logical, btrfs_crit(fs_info, "No mapping for %Lu-%Lu", logical,
logical+len); logical+len);
return 1; return 1;
} }
if (em->start > logical || em->start + em->len < logical) { if (em->start > logical || em->start + em->len < logical) {
btrfs_crit(fs_info, "Invalid mapping for %Lu-%Lu, got " btrfs_crit(fs_info, "Invalid mapping for %Lu-%Lu, got "
"%Lu-%Lu\n", logical, logical+len, em->start, "%Lu-%Lu", logical, logical+len, em->start,
em->start + em->len); em->start + em->len);
free_extent_map(em); free_extent_map(em);
return 1; return 1;
@ -4771,7 +4771,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,
if (em->start > logical || em->start + em->len < logical) { if (em->start > logical || em->start + em->len < logical) {
btrfs_crit(fs_info, "found a bad mapping, wanted %Lu, " btrfs_crit(fs_info, "found a bad mapping, wanted %Lu, "
"found %Lu-%Lu\n", logical, em->start, "found %Lu-%Lu", logical, em->start,
em->start + em->len); em->start + em->len);
free_extent_map(em); free_extent_map(em);
return -EINVAL; return -EINVAL;