From: koraynilay <koray.fra@gmail.com>
To: David Sterba <dsterba@suse.com>
Cc: Chris Mason <mason@kernel.org>, Qu Wenruo <wqu@suse.com>,
Zygo Blaxell <ce3g8jdj@umail.furryterror.org>,
linux-btrfs@vger.kernel.org, koraynilay <koray.fra@gmail.com>
Subject: [PATCH v6 RESEND 5/6] btrfs: add btrfs_compress_typelevel2str() helper
Date: Sat, 26 Sep 2026 19:29:35 +0200 [thread overview]
Message-ID: <20260926172936.337085-6-koray.fra@gmail.com> (raw)
In-Reply-To: <20260926172936.337085-1-koray.fra@gmail.com>
Add the type:level equivalent of btrfs_compress_type2str() and use it
in prop_compression_extract() .
Signed-off-by: koraynilay <koray.fra@gmail.com>
---
fs/btrfs/compression.c | 20 ++++++++++++++++++++
fs/btrfs/compression.h | 2 ++
fs/btrfs/props.c | 19 +++----------------
3 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index de10d96aee8a..84513d28a3ae 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -53,6 +53,26 @@ const char* btrfs_compress_type2str(enum btrfs_compression_type type)
return NULL;
}
+const char* btrfs_compress_typelevel2str(enum btrfs_compression_type type,
+ int level, char *buf, size_t len)
+{
+ switch (type) {
+ case BTRFS_COMPRESS_ZLIB:
+ case BTRFS_COMPRESS_LZO:
+ case BTRFS_COMPRESS_ZSTD:
+ if (level) {
+ snprintf(buf, len, "%s:%d",
+ btrfs_compress_type2str(type), level);
+ return buf;
+ }
+ return btrfs_compress_type2str(type);
+ default:
+ break;
+ }
+
+ return NULL;
+}
+
static inline struct compressed_bio *to_compressed_bio(struct btrfs_bio *bbio)
{
return container_of(bbio, struct compressed_bio, bbio);
diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h
index c63bed9f4152..b9cc1bdd3ccb 100644
--- a/fs/btrfs/compression.h
+++ b/fs/btrfs/compression.h
@@ -132,6 +132,8 @@ extern const struct btrfs_compress_levels btrfs_lzo_compress;
extern const struct btrfs_compress_levels btrfs_zstd_compress;
const char* btrfs_compress_type2str(enum btrfs_compression_type type);
+const char* btrfs_compress_typelevel2str(enum btrfs_compression_type type,
+ int level, char *buf, size_t len);
bool btrfs_compress_is_valid_type(const char *str);
int btrfs_compress_heuristic(struct btrfs_inode *inode, u64 start, u64 end);
diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index 1a6b0103bbfa..fa574fc3bc31 100644
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -414,22 +414,9 @@ static bool prop_compression_ignore(const struct btrfs_inode *inode)
static const char *prop_compression_extract(const struct btrfs_inode *inode,
char *buf, size_t len)
{
- switch (inode->prop_compress) {
- case BTRFS_COMPRESS_ZLIB:
- case BTRFS_COMPRESS_LZO:
- case BTRFS_COMPRESS_ZSTD:
- if (inode->prop_compress_level) {
- snprintf(buf, len, "%s:%d",
- btrfs_compress_type2str(inode->prop_compress),
- inode->prop_compress_level);
- return buf;
- }
- return btrfs_compress_type2str(inode->prop_compress);
- default:
- break;
- }
-
- return NULL;
+ return btrfs_compress_typelevel2str(inode->prop_compress,
+ inode->prop_compress_level,
+ buf, len);
}
static struct prop_handler prop_handlers[] = {
--
2.55.0
next prev parent reply other threads:[~2026-09-26 17:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-26 17:29 [PATCH v6 RESEND 0/6] btrfs: add per-inode compression levels in xattrs koraynilay
2026-09-26 17:29 ` [PATCH v6 RESEND 1/6] btrfs: export btrfs_match_compress_type(), move it to compression.h koraynilay
2026-09-26 17:29 ` [PATCH v6 RESEND 2/6] btrfs: also validate compression levels in btrfs_compress_is_valid_type() koraynilay
2026-09-26 17:29 ` [PATCH v6 RESEND 3/6] btrfs: add per-inode compression levels in xattrs koraynilay
2026-09-26 17:29 ` [PATCH v6 RESEND 4/6] btrfs: support inheritance for per-inode compression levels koraynilay
2026-09-26 17:29 ` koraynilay [this message]
2026-09-26 17:29 ` [PATCH v6 RESEND 6/6] btrfs: preserve btrfs.compression when setting inode flags koraynilay
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=20260926172936.337085-6-koray.fra@gmail.com \
--to=koray.fra@gmail.com \
--cc=ce3g8jdj@umail.furryterror.org \
--cc=dsterba@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=mason@kernel.org \
--cc=wqu@suse.com \
/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