From: Filipe Manana Date: Wed, 17 May 2023 11:02:15 +0000 (+0100) Subject: btrfs: remove pointless label and goto at btrfs_record_unlink_dir() X-Git-Tag: unmap-fix-20230629~61^2~150 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=acfb5a4f1109a4f477f816d572b4f8f65b645bee;p=users%2Fdwmw2%2Flinux.git 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: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 95d01a122b3f6..c988eae6a4f2b 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -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);