Commit adc1ef55 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: add details to error messages at btrfs_delete_delayed_dir_index() 



Update the error messages with:

1) Fix typo in the first one, deltiona -> deletion;

2) Remove redundant part of the first message, the part following the
   comma, and including all the useful information: root, inode, index
   and error value;

3) Update the second message to use more formal language (example 'error'
   instead of 'err'), , remove redundant part about "deletion tree of
   delayed node..." and print the relevant information in the same
   format and order as the first message, without the ugly opening
   parenthesis without a space separating from the previous word.
   This also makes the message similar in format to the one we have at
   btrfs_insert_delayed_dir_index().

Reviewed-by: default avatarBoris Burkov <boris@bur.io>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 0187acef

fs/btrfs/delayed-inode.c

+4 −4
Original line number Diff line number Diff line
@@ -1618,7 +1618,8 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, 
	 */

	if (ret < 0) {

		btrfs_err(trans->fs_info,

"metadata reservation failed for delayed dir item deltiona, should have been reserved");

"metadata reservation failed for delayed dir item deletion, index: %llu, root: %llu, inode: %llu, error: %d",

			  index, btrfs_root_id(node->root), node->inode_id, ret);

		btrfs_release_delayed_item(item);

		goto end;

	}
@@ -1627,9 +1628,8 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, 
	ret = __btrfs_add_delayed_item(node, item);

	if (unlikely(ret)) {

		btrfs_err(trans->fs_info,

			  "err add delayed dir index item(index: %llu) into the deletion tree of the delayed node(root id: %llu, inode id: %llu, errno: %d)",

			  index, btrfs_root_id(node->root),

			  node->inode_id, ret);

"failed to add delayed dir index item, root: %llu, inode: %llu, index: %llu, error: %d",

			  index, btrfs_root_id(node->root), node->inode_id, ret);

		btrfs_delayed_item_release_metadata(dir->root, item);

		btrfs_release_delayed_item(item);

	}