From patchwork Thu Feb 20 11:04:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 13983761 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72A271F3D30 for ; Thu, 20 Feb 2025 11:05:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740049500; cv=none; b=n/DQMTMVmEQZoKR1vN512vPGqQmCQJcig+2NmjBDrj+fYSBans4+f8VJhdRVRLFJ6zktgz5hHnWeDWSEdVte1EsNTrpf0SfWDRRF4bLecm4HZ+dxgeaoCPr86Hv/tfcJwpkv9uBCWAwXIEo9yC/ESAar3bJLwmbI4fM1X8VdVfE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740049500; c=relaxed/simple; bh=GSRyDQepQ8nNM+59vyTKZf4Kiuw+8c2fQg4jvtw63aI=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=a/Or0AQFXhXxID1eNBHjz4HH0ULJyRkFFhRj/toR8FpH9yOQwJtmCq/mSow6XSlTofMdKZ7aZaiIH4j2nUbq9eNmYxZRwXUZAXaA0BG4Mz4UVnlLrX/dlKsAjFZ9WGFQ/e/NoD65lf03WD3XOB4ASYtniV7W0++YDa1WxgqWPxM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZHydnfSo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZHydnfSo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EF6EC4CED1 for ; Thu, 20 Feb 2025 11:04:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740049499; bh=GSRyDQepQ8nNM+59vyTKZf4Kiuw+8c2fQg4jvtw63aI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ZHydnfSoO2ciAb9yLLzDxjT/v8UAGy97r0T76upPgK158aocmyonqei+QdFjIKp62 smZDNWLhr5HLq5ldPXI7hGeMagjofX/S+jYV98BIcoMaZCnkCRr3M5sjsZC7h/xDtF vy2g2A222xgiNXwRxLEjg3jaRVMB46C9hYg3ijOR35zzDKo29kX5FDsDJtxojb+1Tv jfFg7M4ra2XPBAs1Jd8EUA1FZDFxM+IvF0JcMicHoABJLthVM+/vbdbyreHhgpZ9k+ G0UZtYT2MmmDIjedSliGYDlE79egmxfZCCLG6fMohND7TxxEJGtAztKnvzdm5YhH+S gSm2CxRnmuAlQ== From: fdmanana@kernel.org To: linux-btrfs@vger.kernel.org Subject: [PATCH v2 12/30] btrfs: send: factor out common logic when sending xattrs Date: Thu, 20 Feb 2025 11:04:25 +0000 Message-Id: <59b725ede4ee186aaa067b5e467ac309e9476605.1740049233.git.fdmanana@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Filipe Manana We always send xattrs for the current inode only and both callers of send_set_xattr() pass a path for the current inode. So move the path allocation and computation to send_set_xattr(), reducing duplicated code. This also facilitates an upcoming patch. Signed-off-by: Filipe Manana --- fs/btrfs/send.c | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index e0e24ac94aac..3aa2877f8c80 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -4844,11 +4844,19 @@ static int process_all_refs(struct send_ctx *sctx, } static int send_set_xattr(struct send_ctx *sctx, - struct fs_path *path, const char *name, int name_len, const char *data, int data_len) { - int ret = 0; + struct fs_path *path; + int ret; + + path = fs_path_alloc(); + if (!path) + return -ENOMEM; + + ret = get_cur_path(sctx, sctx->cur_ino, sctx->cur_inode_gen, path); + if (ret < 0) + goto out; ret = begin_cmd(sctx, BTRFS_SEND_C_SET_XATTR); if (ret < 0) @@ -4862,6 +4870,8 @@ static int send_set_xattr(struct send_ctx *sctx, tlv_put_failure: out: + fs_path_free(path); + return ret; } @@ -4889,19 +4899,13 @@ static int __process_new_xattr(int num, struct btrfs_key *di_key, const char *name, int name_len, const char *data, int data_len, void *ctx) { - int ret; struct send_ctx *sctx = ctx; - struct fs_path *p; struct posix_acl_xattr_header dummy_acl; /* Capabilities are emitted by finish_inode_if_needed */ if (!strncmp(name, XATTR_NAME_CAPS, name_len)) return 0; - p = fs_path_alloc(); - if (!p) - return -ENOMEM; - /* * This hack is needed because empty acls are stored as zero byte * data in xattrs. Problem with that is, that receiving these zero byte @@ -4918,15 +4922,7 @@ static int __process_new_xattr(int num, struct btrfs_key *di_key, } } - ret = get_cur_path(sctx, sctx->cur_ino, sctx->cur_inode_gen, p); - if (ret < 0) - goto out; - - ret = send_set_xattr(sctx, p, name, name_len, data, data_len); - -out: - fs_path_free(p); - return ret; + return send_set_xattr(sctx, name, name_len, data, data_len); } static int __process_deleted_xattr(int num, struct btrfs_key *di_key, @@ -5803,7 +5799,6 @@ static int send_extent_data(struct send_ctx *sctx, struct btrfs_path *path, */ static int send_capabilities(struct send_ctx *sctx) { - struct fs_path *fspath = NULL; struct btrfs_path *path; struct btrfs_dir_item *di; struct extent_buffer *leaf; @@ -5829,25 +5824,19 @@ static int send_capabilities(struct send_ctx *sctx) leaf = path->nodes[0]; buf_len = btrfs_dir_data_len(leaf, di); - fspath = fs_path_alloc(); buf = kmalloc(buf_len, GFP_KERNEL); - if (!fspath || !buf) { + if (!buf) { ret = -ENOMEM; goto out; } - ret = get_cur_path(sctx, sctx->cur_ino, sctx->cur_inode_gen, fspath); - if (ret < 0) - goto out; - data_ptr = (unsigned long)(di + 1) + btrfs_dir_name_len(leaf, di); read_extent_buffer(leaf, buf, data_ptr, buf_len); - ret = send_set_xattr(sctx, fspath, XATTR_NAME_CAPS, + ret = send_set_xattr(sctx, XATTR_NAME_CAPS, strlen(XATTR_NAME_CAPS), buf, buf_len); out: kfree(buf); - fs_path_free(fspath); btrfs_free_path(path); return ret; }