From patchwork Thu Jun 29 19:58:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sweet Tea Dorminy X-Patchwork-Id: 13297273 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E087EB64DD for ; Thu, 29 Jun 2023 19:58:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232063AbjF2T6n (ORCPT ); Thu, 29 Jun 2023 15:58:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232302AbjF2T6c (ORCPT ); Thu, 29 Jun 2023 15:58:32 -0400 Received: from box.fidei.email (box.fidei.email [IPv6:2605:2700:0:2:a800:ff:feba:dc44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C19930D1 for ; Thu, 29 Jun 2023 12:58:30 -0700 (PDT) Received: from authenticated-user (box.fidei.email [71.19.144.250]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.fidei.email (Postfix) with ESMTPSA id 8390980AE0; Thu, 29 Jun 2023 15:58:30 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=dorminy.me; s=mail; t=1688068710; bh=52Rr41aw2Qb6bdIRB7+n5MrXfQfrmDX6iS0fQCHf6sw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KEJufDkxcLCH0Fr0/lcpvQeQ1av9f+4qSPudeeKrnr03V1G8GiuD4o/6Gba5Ips2F wvkQ76ytRkjJNQG8Jmof83n9/H0wCIadFYhbP7IOWLq5NCU77WbLHWPTAbbXPIHSJ5 KdgFbNU4TkDdU/81wssQW81ELZk48H8NB12qf//uAOicVfSRTmWZMr3l6e/S32/Dhc 0hg0+IBFCtpCMyXkZsPz3j5kEjkSf3ot6l0BFGBoAaEXfXlv3KNtIOPYDG+T28CjI3 dDumfR6lwiotzOoO7N5k1L4E5HYEtTOaK537EDrMEbOkAAt5ws80nEshim9HE1OLVr i824hcHfWulsw== From: Sweet Tea Dorminy To: linux-btrfs@vger.kernel.org, kernel-team@meta.com Cc: Sweet Tea Dorminy Subject: [PATCH 4/8] btrfs-progs: save and load fscrypt extent contexts Date: Thu, 29 Jun 2023 15:58:05 -0400 Message-Id: <09d097a9b94ebf658f552537c5db66a4c87a4f4d.1688068420.git.sweettea-kernel@dorminy.me> In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Mirrors the relevant part of kernel change 'btrfs: save and load fscrypt extent contexts' to progs. Signed-off-by: Sweet Tea Dorminy --- kernel-shared/uapi/btrfs_tree.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel-shared/uapi/btrfs_tree.h b/kernel-shared/uapi/btrfs_tree.h index 2df7cfec..0e62f46b 100644 --- a/kernel-shared/uapi/btrfs_tree.h +++ b/kernel-shared/uapi/btrfs_tree.h @@ -1075,7 +1075,11 @@ struct btrfs_file_extent_item { * always reflects the size uncompressed and without encoding. */ __le64 num_bytes; - + /* + * fscrypt extent encryption context. Only present if extent is + * encrypted (stored in the encryption field). + */ + __u8 fscrypt_context[0]; } __attribute__ ((__packed__)); struct btrfs_csum_item {