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

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: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2017-07-13 15:32:18 +02:00
parent b6e6bca51e
commit 913e153572
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
} }
} }

2
fs/btrfs/free-space-cache.c
View File

@ -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;
} }

2
fs/btrfs/inode.c
View File

@ -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);

2
fs/btrfs/qgroup.c
View File

@ -2646,7 +2646,7 @@ out:
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;
} }

3
fs/btrfs/scrub.c
View File

@ -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;
} }