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

Commit 3d5addaf authored by Liu Bo's avatar Liu Bo Committed by David Sterba
Browse files

Btrfs: do not check inode's runtime flags under root->orphan_lock 



It's not necessary to hold ->orphan_lock when checking inode's runtime
flags.

Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Reviewed-by: default avatarJosef Bacik <jbacik@fb.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent bc5511d0

fs/btrfs/inode.c

+12 −9
Original line number Diff line number Diff line
@@ -3355,14 +3355,6 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans, 
			return -ENOMEM;

	}



	spin_lock(&root->orphan_lock);

	if (!root->orphan_block_rsv) {

		root->orphan_block_rsv = block_rsv;

	} else if (block_rsv) {

		btrfs_free_block_rsv(fs_info, block_rsv);

		block_rsv = NULL;

	}



	if (!test_and_set_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,

			      &inode->runtime_flags)) {

#if 0
@@ -3377,12 +3369,23 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans, 
			insert = 1;

#endif

		insert = 1;

		atomic_inc(&root->orphan_inodes);

	}



	if (!test_and_set_bit(BTRFS_INODE_ORPHAN_META_RESERVED,

			      &inode->runtime_flags))

		reserve = 1;



	spin_lock(&root->orphan_lock);

	/* If someone has created ->orphan_block_rsv, be happy to use it. */

	if (!root->orphan_block_rsv) {

		root->orphan_block_rsv = block_rsv;

	} else if (block_rsv) {

		btrfs_free_block_rsv(fs_info, block_rsv);

		block_rsv = NULL;

	}



	if (insert)

		atomic_inc(&root->orphan_inodes);

	spin_unlock(&root->orphan_lock);



	/* grab metadata reservation from transaction handle */