From: Filipe Manana Date: Tue, 18 Feb 2025 16:00:14 +0000 (+0000) Subject: btrfs: send: simplify return logic from process_changed_xattr() X-Git-Tag: v6.15-rc1~152^2~93 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab12858161b05ca9c47f28f2ce682f82786df919;p=thirdparty%2Flinux.git btrfs: send: simplify return logic from process_changed_xattr() There is no need to have an 'out' label and jump into it since there are no resource cleanups to perform (release locks, free memory, etc), so make this simpler by removing the label and goto and instead return directly. Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index e29b5a5ccdd6e..0cbc8b5b6faba 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -5067,17 +5067,15 @@ static int __process_changed_deleted_xattr(int num, struct btrfs_key *di_key, static int process_changed_xattr(struct send_ctx *sctx) { - int ret = 0; + int ret; ret = iterate_dir_item(sctx->send_root, sctx->left_path, __process_changed_new_xattr, sctx); if (ret < 0) - goto out; - ret = iterate_dir_item(sctx->parent_root, sctx->right_path, - __process_changed_deleted_xattr, sctx); + return ret; -out: - return ret; + return iterate_dir_item(sctx->parent_root, sctx->right_path, + __process_changed_deleted_xattr, sctx); } static int process_all_new_xattrs(struct send_ctx *sctx)