From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83C1E31ED81 for ; Tue, 7 Jul 2026 22:40:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783464012; cv=none; b=X2A+jeKyh0ESQTljhaX9cYTn+94P+4kLZ3XlEb+3XqAgTf7m/pfDvSBjndmB9hx5a7atMAGOxvk1tVCwploEyB4cho+BfTyB9cHX4qCqcKrYn3IqjbLBEU1xgZsSiYvU4ebkNW30N050fVCJrGqXVAVFO2aEWwWuCpx2wGRmzz0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783464012; c=relaxed/simple; bh=0xcPQvcCX1wmZ95Zct1sk3TP/FDTF2kQ2zg19l7bLBc=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=SXoRLyRrk9IAw7WfWiA3Al+g9ToHvQ5cExHlm++6KgE22GcGUd2NvXgqTjURLHFUvOTI6Fsf547U3szQIUYXSA/C4ESog994tSkuG5mYH85Byinv3x6jL1REQiLdNqEerYwQsgzWEuWcqOxdK0AQPOPAZ2qtlYk4ctsOElJNPE4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=a/bLCKnP; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="a/bLCKnP" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-493b691cb44so157025e9.0 for ; Tue, 07 Jul 2026 15:40:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1783464009; x=1784068809; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to :content-type; bh=1JdlkSTFW3hGtg7yS699xZAR0G/OpizsoVpaIbzEm7A=; b=a/bLCKnPyysNXAXfyTZCLHOWpzQ0wGIN8AzJ5XVxbYHxuaFqjFS+9pEsso7wl6f8N3 YtXeG4gvUdtk4QMMmee3lwVCEzGnfFzx3/RbRg8LhQxhVmhc0Lpf8YxERsQqqruEua+4 eB/mFvhYincBxZgebArrdSATXTHa6LvjLO7VSJodREZrRzAId7vese2RFItXa5env3jC Q0mMVd8ZIsnNpUoUtDZBovwY/B415/7Swa5Sa6gRzYCsC5XPWwpXx4YeEdOIJSIqlfKJ H/Uq7DVPjEZreWlbTQjZwLwBYATsRlvDg2/5BVYkdGdgfeAxYbor9Y4ajReP1/OG8xoa i/1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783464009; x=1784068809; h=content-transfer-encoding:content-type:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=1JdlkSTFW3hGtg7yS699xZAR0G/OpizsoVpaIbzEm7A=; b=Xp0qpSUCCFt93I5MOcxSFm3yUIzRnqzbWJuGfP9IEiqH/z3fLEzlqQZhMW3OaBt5dm 7dg7aA2Gz1IEO7B/lu4KQ9vguVjy9EJo12WiKTPn6RzGvzY/IRfKEjBjzlu4btT2zG9V uN6Gfn90pTpDA3BYachWxqLrebdf3OsWCAOaS8at+azPuKKGyo4FsrsnP5xWOjNn/NI1 sraHjTSdAw6ncS2WS++XdeRJ/kXMpwywwtinM99xG703MmGFXAZyX/FWHeU6aTpvIA+a QOiGw+6ku1AukNhtV+nSiPPX56CVlGRaAnFopv7vsmrlH/bTsrOyzinxMXRs5FQjdKpP HwIw== X-Forwarded-Encrypted: i=1; AHgh+Ro29tLEEPe0LYuc064FW1PzBvHEfq4V8mbkmK4/D6IM7Jx4fOH6M2xq6yMWKHCET8MyFCsoZDEJPpgpjQ==@vger.kernel.org X-Gm-Message-State: AOJu0Yxj9oIIPObIGd7UkdOI7B/flriIYcB7KSg6v3cneO3uqzGj9ijR yko29bgBsYY45G59aNv2FjohMQ3YSFYkVSkXVdia53Aka1ScU2p3CUoINaZtip4UWvE= X-Gm-Gg: AfdE7cnwwgS3kcrru7xi8tkM4OdW6yXo0O6glzvIoRZqCkkQUZA1f/YDI2XWniTybFV eaIBD7PU+gJlq+KC0Q+WSlnbNdZ9iMs+v7rKbiJ5EgF16rlKM2aRQ78ijn5tFcErGhMHsuTVPPV UAvEtMhtvg4zPJzMf300YKlOQml2tuXUvwXLWQG6y/8vuJ7gHZt15j8FglljqksC0nUP7OOY6Ts Qb1tjPc9r3fSflzW7nZxXIxIFrU9RzRGjL2lB2aZmsdF/fLRYKZp/7VV75A/Pnfg2orm+/qYb33 AaJv/75RbIGe7xia4sj5eNfJU/aPwNiKQcybwO4E1604YtqivsKmkJ73kSiTWrf1Y498ab8v+df ux/O6sp44o6SStQa8LUmqa7WnFIUNUBUYRbjutIh/fP8GMYY4E8lHWYTvc6alWNqyJ2HSBusFFr wbl+ItOQ== X-Received: by 2002:a05:600c:8a1b:20b0:493:bb23:152a with SMTP id 5b1f17b1804b1-493df09c27dmr64134985e9.34.1783464008847; Tue, 07 Jul 2026 15:40:08 -0700 (PDT) Received: from [172.16.0.229] ([159.196.52.54]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d1e0c4sm18475305ad.49.2026.07.07.15.40.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 Jul 2026 15:40:07 -0700 (PDT) Message-ID: <8ef7b7fa-b3ef-4a7b-b882-d851e9c9eb09@suse.com> Date: Wed, 8 Jul 2026 08:10:01 +0930 Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 4/7] btrfs-progs: print encryptin type field of file extents To: Daniel Vacek , David Sterba Cc: linux-fscrypt@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, Sweet Tea Dorminy References: <20260707142736.2330146-1-neelx@suse.com> <20260707142736.2330146-5-neelx@suse.com> Content-Language: en-US From: Qu Wenruo Autocrypt: addr=wqu@suse.com; keydata= xsBNBFnVga8BCACyhFP3ExcTIuB73jDIBA/vSoYcTyysFQzPvez64TUSCv1SgXEByR7fju3o 8RfaWuHCnkkea5luuTZMqfgTXrun2dqNVYDNOV6RIVrc4YuG20yhC1epnV55fJCThqij0MRL 1NxPKXIlEdHvN0Kov3CtWA+R1iNN0RCeVun7rmOrrjBK573aWC5sgP7YsBOLK79H3tmUtz6b 9Imuj0ZyEsa76Xg9PX9Hn2myKj1hfWGS+5og9Va4hrwQC8ipjXik6NKR5GDV+hOZkktU81G5 gkQtGB9jOAYRs86QG/b7PtIlbd3+pppT0gaS+wvwMs8cuNG+Pu6KO1oC4jgdseFLu7NpABEB AAHNGFF1IFdlbnJ1byA8d3F1QHN1c2UuY29tPsLAlAQTAQgAPgIbAwULCQgHAgYVCAkKCwIE FgIDAQIeAQIXgBYhBC3fcuWlpVuonapC4cI9kfOhJf6oBQJnEXVgBQkQ/lqxAAoJEMI9kfOh Jf6o+jIH/2KhFmyOw4XWAYbnnijuYqb/obGae8HhcJO2KIGcxbsinK+KQFTSZnkFxnbsQ+VY fvtWBHGt8WfHcNmfjdejmy9si2jyy8smQV2jiB60a8iqQXGmsrkuR+AM2V360oEbMF3gVvim 2VSX2IiW9KERuhifjseNV1HLk0SHw5NnXiWh1THTqtvFFY+CwnLN2GqiMaSLF6gATW05/sEd V17MdI1z4+WSk7D57FlLjp50F3ow2WJtXwG8yG8d6S40dytZpH9iFuk12Sbg7lrtQxPPOIEU rpmZLfCNJJoZj603613w/M8EiZw6MohzikTWcFc55RLYJPBWQ+9puZtx1DopW2jOwE0EWdWB rwEIAKpT62HgSzL9zwGe+WIUCMB+nOEjXAfvoUPUwk+YCEDcOdfkkM5FyBoJs8TCEuPXGXBO Cl5P5B8OYYnkHkGWutAVlUTV8KESOIm/KJIA7jJA+Ss9VhMjtePfgWexw+P8itFRSRrrwyUf E+0WcAevblUi45LjWWZgpg3A80tHP0iToOZ5MbdYk7YFBE29cDSleskfV80ZKxFv6koQocq0 vXzTfHvXNDELAuH7Ms/WJcdUzmPyBf3Oq6mKBBH8J6XZc9LjjNZwNbyvsHSrV5bgmu/THX2n g/3be+iqf6OggCiy3I1NSMJ5KtR0q2H2Nx2Vqb1fYPOID8McMV9Ll6rh8S8AEQEAAcLAfAQY AQgAJgIbDBYhBC3fcuWlpVuonapC4cI9kfOhJf6oBQJnEXWBBQkQ/lrSAAoJEMI9kfOhJf6o cakH+QHwDszsoYvmrNq36MFGgvAHRjdlrHRBa4A1V1kzd4kOUokongcrOOgHY9yfglcvZqlJ qfa4l+1oxs1BvCi29psteQTtw+memmcGruKi+YHD7793zNCMtAtYidDmQ2pWaLfqSaryjlzR /3tBWMyvIeWZKURnZbBzWRREB7iWxEbZ014B3gICqZPDRwwitHpH8Om3eZr7ygZck6bBa4MU o1XgbZcspyCGqu1xF/bMAY2iCDcq6ULKQceuKkbeQ8qxvt9hVxJC2W3lHq8dlK1pkHPDg9wO JoAXek8MF37R8gpLoGWl41FIUb3hFiu3zhDDvslYM4BmzI18QgQTQnotJH8= In-Reply-To: <20260707142736.2330146-5-neelx@suse.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 在 2026/7/7 23:57, Daniel Vacek 写道: > From: Sweet Tea Dorminy > > Encrypted file extents now have the 'encryption' field set to an > encryption type. Let's print it. > > Signed-off-by: Sweet Tea Dorminy > Signed-off-by: Daniel Vacek > --- > check/main.c | 1 - > kernel-shared/print-tree.c | 7 +++++-- > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/check/main.c b/check/main.c > index 5e29e2c5..7f438302 100644 > --- a/check/main.c > +++ b/check/main.c > @@ -1778,7 +1778,6 @@ static int process_file_extent(struct btrfs_root *root, > rec->errors |= I_ERR_BAD_FILE_EXTENT; > if (extent_type == BTRFS_FILE_EXTENT_PREALLOC && > (btrfs_file_extent_compression(eb, fi) || > - btrfs_file_extent_encryption(eb, fi) || I think this is a leaf-over change? Thanks, Qu > btrfs_file_extent_other_encoding(eb, fi))) > rec->errors |= I_ERR_BAD_FILE_EXTENT; > if (compression && rec->nodatasum) > diff --git a/kernel-shared/print-tree.c b/kernel-shared/print-tree.c > index 0afa3696..2c0168b0 100644 > --- a/kernel-shared/print-tree.c > +++ b/kernel-shared/print-tree.c > @@ -445,11 +445,12 @@ static void print_file_extent_item(struct extent_buffer *eb, > extent_type, file_extent_type_to_str(extent_type)); > > if (extent_type == BTRFS_FILE_EXTENT_INLINE) { > - printf("\t\tinline extent data size %u ram_bytes %llu compression %hhu (%s)\n", > + printf("\t\tinline extent data size %u ram_bytes %llu compression %hhu (%s) encryption %hhu\n", > btrfs_file_extent_inline_item_len(eb, slot), > btrfs_file_extent_ram_bytes(eb, fi), > btrfs_file_extent_compression(eb, fi), > - compress_str); > + compress_str, > + btrfs_file_extent_encryption(eb, fi)); > return; > } > if (extent_type == BTRFS_FILE_EXTENT_PREALLOC) { > @@ -471,6 +472,8 @@ static void print_file_extent_item(struct extent_buffer *eb, > printf("\t\textent compression %hhu (%s)\n", > btrfs_file_extent_compression(eb, fi), > compress_str); > + printf("\t\textent encryption %hhu\n", > + btrfs_file_extent_encryption(eb, fi)); > } > > /* Caller should ensure sizeof(*ret) >= 16("DATA|TREE_BLOCK") */