This involves the following modication:
- Ordered extent creation
This is done in process_one_page(), now PAGE_SET_ORDERED will call
subpage helper to do the work.
- endio functions
This is done in btrfs_mark_ordered_io_finished().
- btrfs_invalidatepage()
Now the usage of page Ordered flag for ordered extent accounting is fully
subpage compatible.
Signed-off-by: Qu Wenruo <w...@suse.com>
---
fs/btrfs/extent_io.c | 2 +-
fs/btrfs/inode.c | 14 ++++++++++----
fs/btrfs/ordered-data.c | 5 +++--
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 876b7f655df7..cc73fd3c840c 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1824,7 +1824,7 @@ static int process_one_page(struct btrfs_fs_info *fs_info,
len = end + 1 - start;
if (page_ops & PAGE_SET_ORDERED)
- SetPageOrdered(page);
+ btrfs_page_clamp_set_ordered(fs_info, page, start, len);
if (page == locked_page)
return 1;
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 03f9139b391a..f366dc2fb1ff 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -51,6 +51,7 @@
#include "block-group.h"
#include "space-info.h"
#include "zoned.h"
+#include "subpage.h"
struct btrfs_iget_args {
u64 ino;
@@ -170,7 +171,8 @@ static inline void btrfs_cleanup_ordered_extents(struct
btrfs_inode *inode,
index++;
if (!page)
continue;
- ClearPageOrdered(page);
+ btrfs_page_clear_ordered(inode->root->fs_info, page,
+ page_offset(page), PAGE_SIZE);
put_page(page);
}
@@ -8320,12 +8322,13 @@ static void btrfs_invalidatepage(struct page *page,
unsigned int offset,
unsigned int length)
{
struct btrfs_inode *inode = BTRFS_I(page->mapping->host);
+ struct btrfs_fs_info *fs_info = inode->root->fs_info;
struct extent_io_tree *tree = &inode->io_tree;
struct extent_state *cached_state = NULL;
u64 page_start = page_offset(page);
u64 page_end = page_start + PAGE_SIZE - 1;
u64 cur;
- u32 sectorsize = inode->root->fs_info->sectorsize;
+ u32 sectorsize = fs_info->sectorsize;
int inode_evicting = inode->vfs_inode.i_state & I_FREEING;
/*
@@ -8356,6 +8359,7 @@ static void btrfs_invalidatepage(struct page *page,
unsigned int offset,
struct btrfs_ordered_extent *ordered;
bool delete_states = false;
u64 range_end;
+ u32 range_len;
/*
* Here we can't pass "file_offset = cur" and
@@ -8382,7 +8386,9 @@ static void btrfs_invalidatepage(struct page *page,
unsigned int offset,
range_end = min(ordered->file_offset + ordered->num_bytes - 1,
page_end);
- if (!PageOrdered(page)) {
+ ASSERT(range_end + 1 - cur < U32_MAX);
+ range_len = range_end + 1 - cur;
+ if (!btrfs_page_test_ordered(fs_info, page, cur, range_len)) {
/*
* If Ordered (Private2) is cleared, it means endio has
* already been executed for the range.
@@ -8392,7 +8398,7 @@ static void btrfs_invalidatepage(struct page *page,
unsigned int offset,
delete_states = false;
goto next;
}
- ClearPageOrdered(page);
+ btrfs_page_clear_ordered(fs_info, page, cur, range_len);
/*
* IO on this page will never be started, so we need to account
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 3e782145247e..03853e7494f7 100644
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -16,6 +16,7 @@
#include "compression.h"
#include "delalloc-space.h"
#include "qgroup.h"
+#include "subpage.h"
static struct kmem_cache *btrfs_ordered_extent_cache;
@@ -402,11 +403,11 @@ void btrfs_mark_ordered_io_finished(struct btrfs_inode
*inode,
*
* If no such bit, we need to skip to next range.
*/
- if (!PageOrdered(page)) {
+ if (!btrfs_page_test_ordered(fs_info, page, cur, len)) {
cur += len;
continue;
}
- ClearPageOrdered(page);
+ btrfs_page_clear_ordered(fs_info, page, cur, len);
}
/* Now we're fine to update the accounting */
--
2.31.1
