linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Vacek <neelx@suse.com>
To: David Sterba <dsterba@suse.com>
Cc: linux-btrfs@vger.kernel.org, Daniel Vacek <neelx@suse.com>,
	Josef Bacik <josef@toxicpanda.com>,
	Sweet Tea Dorminy <sweettea-kernel@dorminy.me>
Subject: [PATCH 4/8] btrfs-progs: add inode encryption contexts
Date: Wed, 15 Oct 2025 14:11:52 +0200	[thread overview]
Message-ID: <20251015121157.1348124-5-neelx@suse.com> (raw)
In-Reply-To: <20251015121157.1348124-1-neelx@suse.com>

From: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>

Recapitulates relevant parts of kernel change 'btrfs: add inode
encryption contexts'.

Signed-off-by: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>
---
 kernel-shared/uapi/btrfs_tree.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kernel-shared/uapi/btrfs_tree.h b/kernel-shared/uapi/btrfs_tree.h
index 4b4f45aa..e3a55665 100644
--- a/kernel-shared/uapi/btrfs_tree.h
+++ b/kernel-shared/uapi/btrfs_tree.h
@@ -165,6 +165,8 @@
 #define BTRFS_VERITY_DESC_ITEM_KEY	36
 #define BTRFS_VERITY_MERKLE_ITEM_KEY	37
 
+#define BTRFS_FSCRYPT_CTXT_ITEM_KEY	41
+
 #define BTRFS_ORPHAN_ITEM_KEY		48
 /* reserve 2-15 close to the inode for later flexibility */
 
@@ -425,6 +427,7 @@ static inline __u8 btrfs_dir_flags_to_ftype(__u8 flags)
 #define BTRFS_INODE_NOATIME		(1U << 9)
 #define BTRFS_INODE_DIRSYNC		(1U << 10)
 #define BTRFS_INODE_COMPRESS		(1U << 11)
+#define BTRFS_INODE_ENCRYPT		(1U << 12)
 
 #define BTRFS_INODE_ROOT_ITEM_INIT	(1U << 31)
 
@@ -441,6 +444,7 @@ static inline __u8 btrfs_dir_flags_to_ftype(__u8 flags)
 	 BTRFS_INODE_NOATIME |						\
 	 BTRFS_INODE_DIRSYNC |						\
 	 BTRFS_INODE_COMPRESS |						\
+	 BTRFS_INODE_ENCRYPT |						\
 	 BTRFS_INODE_ROOT_ITEM_INIT)
 
 #define BTRFS_INODE_RO_VERITY		(1U << 0)
-- 
2.51.0


  parent reply	other threads:[~2025-10-15 12:12 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-15 12:11 [PATCH 0/8] btrfs-progs: fscrypt updates Daniel Vacek
2025-10-15 12:11 ` [PATCH 1/8] btrfs-progs: check: fix max inline extent size Daniel Vacek
2025-10-15 12:11 ` [PATCH 2/8] btrfs-progs: add new FEATURE_INCOMPAT_ENCRYPT flag Daniel Vacek
2025-10-24 21:16   ` David Sterba
2025-10-15 12:11 ` [PATCH 3/8] btrfs-progs: start tracking extent encryption context info Daniel Vacek
2025-10-24 21:29   ` David Sterba
2025-10-24 22:43     ` Qu Wenruo
2025-11-05  8:28       ` Daniel Vacek
2025-11-05  8:22     ` Daniel Vacek
2025-11-05  8:27       ` Daniel Vacek
2025-11-05  9:12       ` Qu Wenruo
2025-11-05 10:55         ` Daniel Vacek
2025-11-26 14:11           ` David Sterba
2025-11-27  8:40             ` Daniel Vacek
2025-10-15 12:11 ` Daniel Vacek [this message]
2025-10-15 12:11 ` [PATCH 5/8] btrfs-progs: interpret encrypted file extents Daniel Vacek
2025-11-02 22:26   ` Qu Wenruo
2025-11-03  9:57     ` Daniel Vacek
2025-11-05  7:46       ` Daniel Vacek
2025-10-15 12:11 ` [PATCH 6/8] btrfs-progs: handle fscrypt context items Daniel Vacek
2025-10-15 12:11 ` [PATCH 7/8] btrfs-progs: check: update inline extent length checking Daniel Vacek
2025-10-15 12:11 ` [PATCH 8/8] btrfs-progs: string-utils: do not escape space while printing Daniel Vacek
2025-10-17 16:43   ` David Sterba
2025-10-18 17:50     ` Daniel Vacek
2025-10-15 21:10 ` [PATCH 0/8] btrfs-progs: fscrypt updates Qu Wenruo
2025-10-15 21:19   ` Daniel Vacek
2025-10-15 21:20     ` Qu Wenruo
2025-10-16 15:16     ` Johannes Thumshirn
2025-10-17 20:54   ` Mark Harmstone
2025-10-24 21:10     ` David Sterba
2025-10-17 16:45 ` David Sterba
2025-10-18 18:01   ` Daniel Vacek
2025-11-04 14:56 ` David Sterba
  -- strict thread matches above, loose matches on Subject: below --
2023-10-10 20:28 [PATCH 0/8] btrfs-progs: add fscrypt support Josef Bacik
2023-10-10 20:28 ` [PATCH 4/8] btrfs-progs: add inode encryption contexts Josef Bacik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251015121157.1348124-5-neelx@suse.com \
    --to=neelx@suse.com \
    --cc=dsterba@suse.com \
    --cc=josef@toxicpanda.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=sweettea-kernel@dorminy.me \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).