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

Commit 05a5bd7c authored by Omar Sandoval's avatar Omar Sandoval Committed by David Sterba
Browse files

Btrfs: delete dead code in btrfs_orphan_commit_root() 



btrfs_orphan_commit_root() tries to delete an orphan item for a
subvolume in the tree root, but we don't actually insert that item in
the first place. See commit 0a0d4415 ("Btrfs: delete dead code in
btrfs_orphan_add()"). We can get rid of it.

Reviewed-by: default avatarJosef Bacik <jbacik@fb.com>
Signed-off-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 7b40b695

fs/btrfs/inode.c

+0 −12
Original line number Diff line number Diff line
@@ -3307,7 +3307,6 @@ void btrfs_orphan_commit_root(struct btrfs_trans_handle *trans, 
{

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct btrfs_block_rsv *block_rsv;

	int ret;



	if (atomic_read(&root->orphan_inodes) ||

	    root->orphan_cleanup_state != ORPHAN_CLEANUP_DONE)
@@ -3328,17 +3327,6 @@ void btrfs_orphan_commit_root(struct btrfs_trans_handle *trans, 
	root->orphan_block_rsv = NULL;

	spin_unlock(&root->orphan_lock);



	if (test_bit(BTRFS_ROOT_ORPHAN_ITEM_INSERTED, &root->state) &&

	    btrfs_root_refs(&root->root_item) > 0) {

		ret = btrfs_del_orphan_item(trans, fs_info->tree_root,

					    root->root_key.objectid);

		if (ret)

			btrfs_abort_transaction(trans, ret);

		else

			clear_bit(BTRFS_ROOT_ORPHAN_ITEM_INSERTED,

				  &root->state);

	}



	if (block_rsv) {

		WARN_ON(block_rsv->size > 0);

		btrfs_free_block_rsv(fs_info, block_rsv);