Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 351fd353 authored by David Sterba's avatar David Sterba Committed by Chris Mason
Browse files

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: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 7d788742
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -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;
+2 −2
Original line number Original line Diff line number Diff line
@@ -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);
+1 −1
Original line number Original line Diff line number Diff line
@@ -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);
}
}


/*
/*
+2 −2
Original line number Original line Diff line number Diff line
@@ -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;
	}
	}
+2 −2
Original line number Original line Diff line number Diff line
@@ -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);
}
}
Loading