From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: wqu@suse.com, dsterba@suse.com, y16267966@gmail.com
Subject: [PATCH v2 3/4] btrfs-progs: convert: refactor __btrfs_record_file_extent to add a prealloc flag
Date: Mon, 6 May 2024 11:04:57 +0800 [thread overview]
Message-ID: <3953c91e40178273e0896b544e0a7bf9f219deb0.1714963428.git.anand.jain@oracle.com> (raw)
In-Reply-To: <cover.1714963428.git.anand.jain@oracle.com>
This preparatory patch adds an argument '%prealloc' to the function
__btrfs_record_file_extent(), to be used in the following patches.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v2: pass btrfs_record_file_extent() actual flags instead of has_prealloc boolean.
common/extent-tree-utils.c | 8 ++++----
common/extent-tree-utils.h | 2 +-
convert/main.c | 10 ++++++----
convert/source-fs.c | 5 +++--
convert/source-reiserfs.c | 2 +-
mkfs/rootdir.c | 3 ++-
6 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/common/extent-tree-utils.c b/common/extent-tree-utils.c
index 34c7e5095160..53c10734408d 100644
--- a/common/extent-tree-utils.c
+++ b/common/extent-tree-utils.c
@@ -122,7 +122,7 @@ static int __btrfs_record_file_extent(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u64 objectid,
struct btrfs_inode_item *inode,
u64 file_pos, u64 disk_bytenr,
- u64 *ret_num_bytes)
+ u64 *ret_num_bytes, u64 flags)
{
int ret;
struct btrfs_fs_info *info = root->fs_info;
@@ -229,7 +229,7 @@ static int __btrfs_record_file_extent(struct btrfs_trans_handle *trans,
leaf = path->nodes[0];
fi = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_file_extent_item);
btrfs_set_file_extent_generation(leaf, fi, trans->transid);
- btrfs_set_file_extent_type(leaf, fi, BTRFS_FILE_EXTENT_REG);
+ btrfs_set_file_extent_type(leaf, fi, flags);
btrfs_set_file_extent_disk_bytenr(leaf, fi, extent_bytenr);
btrfs_set_file_extent_disk_num_bytes(leaf, fi, extent_num_bytes);
btrfs_set_file_extent_offset(leaf, fi, extent_offset);
@@ -265,7 +265,7 @@ int btrfs_record_file_extent(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u64 objectid,
struct btrfs_inode_item *inode,
u64 file_pos, u64 disk_bytenr,
- u64 num_bytes)
+ u64 num_bytes, u64 flags)
{
u64 cur_disk_bytenr = disk_bytenr;
u64 cur_file_pos = file_pos;
@@ -276,7 +276,7 @@ int btrfs_record_file_extent(struct btrfs_trans_handle *trans,
ret = __btrfs_record_file_extent(trans, root, objectid,
inode, cur_file_pos,
cur_disk_bytenr,
- &cur_num_bytes);
+ &cur_num_bytes, flags);
if (ret < 0)
break;
cur_disk_bytenr += cur_num_bytes;
diff --git a/common/extent-tree-utils.h b/common/extent-tree-utils.h
index f03d9c438375..dce48c43faf5 100644
--- a/common/extent-tree-utils.h
+++ b/common/extent-tree-utils.h
@@ -31,6 +31,6 @@ int btrfs_record_file_extent(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u64 objectid,
struct btrfs_inode_item *inode,
u64 file_pos, u64 disk_bytenr,
- u64 num_bytes);
+ u64 num_bytes, u64 flags);
#endif
diff --git a/convert/main.c b/convert/main.c
index f18fab4a236c..fb0f97d949d4 100644
--- a/convert/main.c
+++ b/convert/main.c
@@ -337,7 +337,7 @@ static int create_image_file_range(struct btrfs_trans_handle *trans,
return -EINVAL;
}
ret = btrfs_record_file_extent(trans, root, ino, inode, bytenr,
- disk_bytenr, len);
+ disk_bytenr, len, BTRFS_FILE_EXTENT_REG);
if (ret < 0)
return ret;
@@ -426,7 +426,8 @@ static int migrate_one_reserved_range(struct btrfs_trans_handle *trans,
/* Now handle extent item and file extent things */
ret = btrfs_record_file_extent(trans, root, ino, inode, cur_off,
- key.objectid, key.offset);
+ key.objectid, key.offset,
+ BTRFS_FILE_EXTENT_REG);
if (ret < 0)
break;
/* Finally, insert csum items */
@@ -438,7 +439,7 @@ static int migrate_one_reserved_range(struct btrfs_trans_handle *trans,
hole_len = cur_off - hole_start;
if (hole_len) {
ret = btrfs_record_file_extent(trans, root, ino, inode,
- hole_start, 0, hole_len);
+ hole_start, 0, hole_len, BTRFS_FILE_EXTENT_REG);
if (ret < 0)
break;
}
@@ -455,7 +456,8 @@ static int migrate_one_reserved_range(struct btrfs_trans_handle *trans,
*/
if (range_end(range) - hole_start > 0)
ret = btrfs_record_file_extent(trans, root, ino, inode,
- hole_start, 0, range_end(range) - hole_start);
+ hole_start, 0, range_end(range) - hole_start,
+ BTRFS_FILE_EXTENT_REG);
return ret;
}
diff --git a/convert/source-fs.c b/convert/source-fs.c
index 66561438866e..df5ce66caf7f 100644
--- a/convert/source-fs.c
+++ b/convert/source-fs.c
@@ -262,7 +262,7 @@ int record_file_blocks(struct blk_iterate_data *data,
if (old_disk_bytenr == 0)
return btrfs_record_file_extent(data->trans, root,
data->objectid, data->inode, file_pos, 0,
- num_bytes);
+ num_bytes, BTRFS_FILE_EXTENT_REG);
/*
* Search real disk bytenr from convert root
@@ -316,7 +316,8 @@ int record_file_blocks(struct blk_iterate_data *data,
old_disk_bytenr + num_bytes) - cur_off;
ret = btrfs_record_file_extent(data->trans, data->root,
data->objectid, data->inode, file_pos,
- real_disk_bytenr, cur_len);
+ real_disk_bytenr, cur_len,
+ BTRFS_FILE_EXTENT_REG);
if (ret < 0)
break;
cur_off += cur_len;
diff --git a/convert/source-reiserfs.c b/convert/source-reiserfs.c
index 3edc72ed08a5..746892ff0a8d 100644
--- a/convert/source-reiserfs.c
+++ b/convert/source-reiserfs.c
@@ -365,7 +365,7 @@ static int convert_direct(struct btrfs_trans_handle *trans,
return ret;
return btrfs_record_file_extent(trans, root, objectid, inode, offset,
- key.objectid, sectorsize);
+ key.objectid, sectorsize, BTRFS_FILE_EXTENT_REG);
}
static int reiserfs_convert_tail(struct btrfs_trans_handle *trans,
diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c
index 4ae9f435a7b7..cb6659319b7d 100644
--- a/mkfs/rootdir.c
+++ b/mkfs/rootdir.c
@@ -411,7 +411,8 @@ again:
if (bytes_read) {
ret = btrfs_record_file_extent(trans, root, objectid,
- btrfs_inode, file_pos, first_block, cur_bytes);
+ btrfs_inode, file_pos, first_block, cur_bytes,
+ false);
if (ret)
goto end;
--
2.39.3
next prev parent reply other threads:[~2024-05-06 3:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-06 3:04 [PATCH v2 0/4] btrfs-progs: add support ext4 unwritten file extent Anand Jain
2024-05-06 3:04 ` [PATCH v2 1/4] btrfs-progs: convert: refactor ext2_create_file_extents add argument ext2_inode Anand Jain
2024-05-06 3:04 ` [PATCH v2 2/4] btrfs-progs: convert: struct blk_iterate_data, add ext2-specific file inode pointers Anand Jain
2024-05-06 3:04 ` Anand Jain [this message]
2024-05-06 3:04 ` [PATCH v2 4/4] btrfs-progs: convert: support ext2 unwritten file data extents Anand Jain
2024-05-06 5:41 ` Qu Wenruo
2024-05-06 5:59 ` Qu Wenruo
2024-05-06 9:56 ` Anand Jain
2024-05-06 10:25 ` Qu Wenruo
2024-05-07 1:25 ` Qu Wenruo
2024-05-09 9:17 ` Anand Jain
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=3953c91e40178273e0896b544e0a7bf9f219deb0.1714963428.git.anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=dsterba@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=wqu@suse.com \
--cc=y16267966@gmail.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).