Commit 913e1535 authored by David Sterba's avatar David Sterba

btrfs: drop newlines from strings when using btrfs_* helpers

The helpers append "\n" so we can keep the actual strings shorter. The
extra newline will print an empty line.  Some messages have been
slightly modified to be more consistent with the rest (lowercase first
letter).
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent b6e6bca5
...@@ -6832,7 +6832,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans, ...@@ -6832,7 +6832,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans,
if (ret) { if (ret) {
const char *errstr = btrfs_decode_error(ret); const char *errstr = btrfs_decode_error(ret);
btrfs_warn(fs_info, btrfs_warn(fs_info,
"Discard failed while removing blockgroup: errno=%d %s\n", "discard failed while removing blockgroup: errno=%d %s",
ret, errstr); ret, errstr);
} }
} }
......
...@@ -709,7 +709,7 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode, ...@@ -709,7 +709,7 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
if (!BTRFS_I(inode)->generation) { if (!BTRFS_I(inode)->generation) {
btrfs_info(fs_info, btrfs_info(fs_info,
"The free space cache file (%llu) is invalid. skip it\n", "the free space cache file (%llu) is invalid, skip it",
offset); offset);
return 0; return 0;
} }
......
...@@ -8017,7 +8017,7 @@ static int dio_read_error(struct inode *inode, struct bio *failed_bio, ...@@ -8017,7 +8017,7 @@ static int dio_read_error(struct inode *inode, struct bio *failed_bio,
bio_set_op_attrs(bio, REQ_OP_READ, read_mode); bio_set_op_attrs(bio, REQ_OP_READ, read_mode);
btrfs_debug(BTRFS_I(inode)->root->fs_info, btrfs_debug(BTRFS_I(inode)->root->fs_info,
"Repair DIO Read Error: submitting new dio read[%#x] to this_mirror=%d, in_validation=%d\n", "repair DIO read error: submitting new dio read[%#x] to this_mirror=%d, in_validation=%d",
read_mode, failrec->this_mirror, failrec->in_validation); read_mode, failrec->this_mirror, failrec->in_validation);
ret = submit_dio_repair_bio(inode, bio, failrec->this_mirror); ret = submit_dio_repair_bio(inode, bio, failrec->this_mirror);
......
...@@ -2646,7 +2646,7 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work) ...@@ -2646,7 +2646,7 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work)
if (IS_ERR(trans)) { if (IS_ERR(trans)) {
err = PTR_ERR(trans); err = PTR_ERR(trans);
btrfs_err(fs_info, btrfs_err(fs_info,
"fail to start transaction for status update: %d\n", "fail to start transaction for status update: %d",
err); err);
goto done; goto done;
} }
......
...@@ -3869,8 +3869,7 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx, ...@@ -3869,8 +3869,7 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,
ro_set = 0; ro_set = 0;
} else { } else {
btrfs_warn(fs_info, btrfs_warn(fs_info,
"failed setting block group ro, ret=%d\n", "failed setting block group ro: %d", ret);
ret);
btrfs_put_block_group(cache); btrfs_put_block_group(cache);
break; break;
} }
......
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