From patchwork Thu Jun 29 19:58:06 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: 13297274 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 585D8C001DF for ; Thu, 29 Jun 2023 19:58:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232039AbjF2T6m (ORCPT ); Thu, 29 Jun 2023 15:58:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232311AbjF2T6d (ORCPT ); Thu, 29 Jun 2023 15:58:33 -0400 Received: from box.fidei.email (box.fidei.email [71.19.144.250]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6504230DD for ; Thu, 29 Jun 2023 12:58:32 -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 D522880AEE; Thu, 29 Jun 2023 15:58:31 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=dorminy.me; s=mail; t=1688068712; bh=52Rr41aw2Qb6bdIRB7+n5MrXfQfrmDX6iS0fQCHf6sw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qtdf8SEZ9HKoGpWydd0TdNPJ49+0HEEkTwP/F1ZokrP/WREjhi+xkrnn8EMUDFsAe sHcXKP7E95cnuakna/qiIXm0kZ8BUFJtAnibs+4yqbyVsx2exQaChdfNy870oLB7Sg Nhhzi4R8qj7ORqU6acsADnoNMuCaQqxWce8w2svvqUTu6PDdX1JcX70DgB0tHLRWIR 1JIK8U0LgaY4MB9RV3kApHZiwFbCVfld6cb1f/vfgwRodfIBw5bpaOBY3qjMBEhcQ+ GLdIZfDYNyOXQDrLWAp2T/OfzkeeFBAmP06JYdarFr6IYEejwBfkHFXobuVOBIQL7b VNJG1bAGVbHYg== From: Sweet Tea Dorminy To: linux-btrfs@vger.kernel.org, kernel-team@meta.com Cc: Sweet Tea Dorminy Subject: [PATCH 4/8] progs: save and load fscrypt extent contexts Date: Thu, 29 Jun 2023 15:58:06 -0400 Message-Id: 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 {