From: Sidong Yang <realwakka@gmail.com>
To: linux-btrfs <linux-btrfs@vger.kernel.org>,
David Sterba <dsterba@suse.cz>,
Qu Wenruo <quwenruo.btrfs@gmx.com>
Cc: Sidong Yang <realwakka@gmail.com>
Subject: [PATCH v5 1/2] btrfs-progs: export util functions about file extent items
Date: Sun, 22 Aug 2021 15:01:39 +0000 [thread overview]
Message-ID: <20210822150140.44152-2-realwakka@gmail.com> (raw)
In-Reply-To: <20210822150140.44152-1-realwakka@gmail.com>
This patch export two functions that convert enum about file extents to
string. It can be used in other code like inspect-internal command. And
this patch also make compress_type_to_str() function more safe by using
strncpy() than strcpy().
Signed-off-by: Sidong Yang <realwakka@gmail.com>
---
kernel-shared/print-tree.c | 18 +++++++++---------
kernel-shared/print-tree.h | 5 +++++
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/kernel-shared/print-tree.c b/kernel-shared/print-tree.c
index e5d4b453..ce1c0ed3 100644
--- a/kernel-shared/print-tree.c
+++ b/kernel-shared/print-tree.c
@@ -338,27 +338,27 @@ static void print_uuids(struct extent_buffer *eb)
printf("fs uuid %s\nchunk uuid %s\n", fs_uuid, chunk_uuid);
}
-static void compress_type_to_str(u8 compress_type, char *ret)
+void btrfs_compress_type_to_str(u8 compress_type, char *ret)
{
switch (compress_type) {
case BTRFS_COMPRESS_NONE:
- strcpy(ret, "none");
+ strncpy(ret, "none", BTRFS_COMPRESS_STR_LEN);
break;
case BTRFS_COMPRESS_ZLIB:
- strcpy(ret, "zlib");
+ strncpy(ret, "zlib", BTRFS_COMPRESS_STR_LEN);
break;
case BTRFS_COMPRESS_LZO:
- strcpy(ret, "lzo");
+ strncpy(ret, "lzo", BTRFS_COMPRESS_STR_LEN);
break;
case BTRFS_COMPRESS_ZSTD:
- strcpy(ret, "zstd");
+ strncpy(ret, "zstd", BTRFS_COMPRESS_STR_LEN);
break;
default:
- sprintf(ret, "UNKNOWN.%d", compress_type);
+ snprintf(ret, BTRFS_COMPRESS_STR_LEN, "UNKNOWN.%d", compress_type);
}
}
-static const char* file_extent_type_to_str(u8 type)
+const char* btrfs_file_extent_type_to_str(u8 type)
{
switch (type) {
case BTRFS_FILE_EXTENT_INLINE: return "inline";
@@ -376,12 +376,12 @@ static void print_file_extent_item(struct extent_buffer *eb,
unsigned char extent_type = btrfs_file_extent_type(eb, fi);
char compress_str[16];
- compress_type_to_str(btrfs_file_extent_compression(eb, fi),
+ btrfs_compress_type_to_str(btrfs_file_extent_compression(eb, fi),
compress_str);
printf("\t\tgeneration %llu type %hhu (%s)\n",
btrfs_file_extent_generation(eb, fi),
- extent_type, file_extent_type_to_str(extent_type));
+ extent_type, btrfs_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",
diff --git a/kernel-shared/print-tree.h b/kernel-shared/print-tree.h
index 80fb6ef7..3b96e89d 100644
--- a/kernel-shared/print-tree.h
+++ b/kernel-shared/print-tree.h
@@ -33,6 +33,8 @@ enum {
BTRFS_PRINT_TREE_DEFAULT = BTRFS_PRINT_TREE_BFS,
};
+#define BTRFS_COMPRESS_STR_LEN 12
+
void btrfs_print_tree(struct extent_buffer *eb, unsigned int mode);
void btrfs_print_leaf(struct extent_buffer *eb, unsigned int mode);
@@ -43,4 +45,7 @@ void print_objectid(FILE *stream, u64 objectid, u8 type);
void print_key_type(FILE *stream, u64 objectid, u8 type);
void btrfs_print_superblock(struct btrfs_super_block *sb, int full);
+void btrfs_compress_type_to_str(u8 compress_type, char *ret);
+const char* btrfs_file_extent_type_to_str(u8 type);
+
#endif
--
2.25.1
next prev parent reply other threads:[~2021-08-22 15:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-22 15:01 [RFC PATCH v5 0/2] Add subcommand that dumps file extents Sidong Yang
2021-08-22 15:01 ` Sidong Yang [this message]
2021-08-22 15:01 ` [PATCH v5 2/2] btrfs-progs: cmds: " Sidong Yang
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=20210822150140.44152-2-realwakka@gmail.com \
--to=realwakka@gmail.com \
--cc=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
--cc=quwenruo.btrfs@gmx.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;
as well as URLs for NNTP newsgroup(s).