diff options
| author | Christian Brauner <brauner@kernel.org> | 2024-10-04 09:24:28 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2024-10-04 09:24:28 +0200 |
| commit | c6bbfc7ce1567eb7928f22d92b6ad34d8e4ea22b (patch) | |
| tree | 88ad5b79876361b117c42e3ed9daf68c57372d29 /fs/btrfs/inode.c | |
| parent | 9852d85ec9d492ebef56dc5f229416c925758edc (diff) | |
| parent | 7735348d9f3a64a2d9a40f39d17265f836f31b10 (diff) | |
Merge patch series "Filesystem page flags cleanup"
Matthew Wilcox (Oracle) <willy@infradead.org> says:
The first four patches continue the work begun in 02e1960aafac to make
the mappedtodisk/owner_2 flag available to filesystems which don't use
buffer heads. The last two remove uses of Private2 (we're achingly close
to being rid of it entirely, but that doesn't seem like it'll land this
merge window).
* patches from https://lore.kernel.org/r/20241002040111.1023018-1-willy@infradead.org:
migrate: Remove references to Private2
ceph: Remove call to PagePrivate2()
btrfs: Switch from using the private_2 flag to owner_2
mm: Remove PageMappedToDisk
nilfs2: Convert nilfs_copy_buffer() to use folios
fs: Move clearing of mappedtodisk to buffer.c
Link: https://lore.kernel.org/r/20241002040111.1023018-1-willy@infradead.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index edac499fd83d2..a4055896261db 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1513,7 +1513,7 @@ static noinline int cow_file_range(struct btrfs_inode *inode, * (which the caller expects to stay locked), don't clear any * dirty bits and don't set any writeback bits * - * Do set the Ordered (Private2) bit so we know this page was + * Do set the Ordered flag so we know this page was * properly setup for writepage. */ page_ops = (keep_locked ? 0 : PAGE_UNLOCK); @@ -7292,7 +7292,7 @@ static void btrfs_invalidate_folio(struct folio *folio, size_t offset, * * But already submitted bio can still be finished on this folio. * Furthermore, endio function won't skip folio which has Ordered - * (Private2) already cleared, so it's possible for endio and + * already cleared, so it's possible for endio and * invalidate_folio to do the same ordered extent accounting twice * on one folio. * @@ -7358,7 +7358,7 @@ static void btrfs_invalidate_folio(struct folio *folio, size_t offset, range_len = range_end + 1 - cur; if (!btrfs_folio_test_ordered(fs_info, folio, cur, range_len)) { /* - * If Ordered (Private2) is cleared, it means endio has + * If Ordered is cleared, it means endio has * already been executed for the range. * We can't delete the extent states as * btrfs_finish_ordered_io() may still use some of them. @@ -7431,7 +7431,7 @@ next: } /* * We have iterated through all ordered extents of the page, the page - * should not have Ordered (Private2) anymore, or the above iteration + * should not have Ordered anymore, or the above iteration * did something wrong. */ ASSERT(!folio_test_ordered(folio)); |