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

btrfs: remove pointless label and goto at btrfs_record_unlink_dir() 



There's no point of having a label and goto at btrfs_record_unlink_dir()
because the function is trivial and can just return early if we are not
in a rename context. So remove the label and goto and instead return
early if we are not in a rename.

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 1e75ef03

fs/btrfs/tree-log.c

+3 −7
Original line number Diff line number Diff line
@@ -7325,6 +7325,9 @@ void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans, 
	inode->last_unlink_trans = trans->transid;

	mutex_unlock(&inode->log_mutex);



	if (!for_rename)

		return;



	/*

	 * If this directory was already logged, any new names will be logged

	 * with btrfs_log_new_name() and old names will be deleted from the log
@@ -7350,13 +7353,6 @@ void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans, 
	 * properly.  So, we have to be conservative and force commits

	 * so the new name gets discovered.

	 */

	if (for_rename)

		goto record;



	/* we can safely do the unlink without any special recording */

	return;



record:

	mutex_lock(&dir->log_mutex);

	dir->last_unlink_trans = trans->transid;

	mutex_unlock(&dir->log_mutex);