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

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

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -6832,7 +6832,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans, 
		if (ret) {

			const char *errstr = btrfs_decode_error(ret);

			btrfs_warn(fs_info,

				   "Discard failed while removing blockgroup: errno=%d %s\n",

			   "discard failed while removing blockgroup: errno=%d %s",

				   ret, errstr);

		}

	}

fs/btrfs/free-space-cache.c

+1 −1
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode, 


	if (!BTRFS_I(inode)->generation) {

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

		return 0;

	}

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -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);



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



	ret = submit_dio_repair_bio(inode, bio, failrec->this_mirror);

fs/btrfs/qgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -2646,7 +2646,7 @@ out: 
	if (IS_ERR(trans)) {

		err = PTR_ERR(trans);

		btrfs_err(fs_info,

			  "fail to start transaction for status update: %d\n",

			  "fail to start transaction for status update: %d",

			  err);

		goto done;

	}

fs/btrfs/scrub.c

+1 −2
Original line number Diff line number Diff line
@@ -3869,8 +3869,7 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx, 
			ro_set = 0;

		} else {

			btrfs_warn(fs_info,

				   "failed setting block group ro, ret=%d\n",

				   ret);

				   "failed setting block group ro: %d", ret);

			btrfs_put_block_group(cache);

			break;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE