mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-01 00:58:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: convert super block writes to folio in wait_dev_supers()

Browse source 
This is a direct conversion from pages to folios, assuming single page
folio.  Also removes a few calls to compound_head() and calls to
obsolete APIs.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Matthew Wilcox (Oracle) 2024-04-20 03:49:56 +01:00 committed by David Sterba
parent 8fde439b2d
commit c94b7349b8
1 changed files with 12 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

23
fs/btrfs/disk-io.c
View file

@ -3833,8 +3833,7 @@ static int write_dev_supers(struct btrfs_device *device,
* Wait for write completion of superblocks done by write_dev_supers, * Wait for write completion of superblocks done by write_dev_supers,
* @max_mirrors same for write and wait phases. * @max_mirrors same for write and wait phases.
* *
* Return number of errors when page is not found or not marked up to * Return number of errors when folio is not found or not marked up to date.
* date.
*/ */
static int wait_dev_supers(struct btrfs_device *device, int max_mirrors) static int wait_dev_supers(struct btrfs_device *device, int max_mirrors)
{ {
@ -3848,7 +3847,7 @@ static int wait_dev_supers(struct btrfs_device *device, int max_mirrors)
max_mirrors = BTRFS_SUPER_MIRROR_MAX; max_mirrors = BTRFS_SUPER_MIRROR_MAX;
for (i = 0; i < max_mirrors; i++) { for (i = 0; i < max_mirrors; i++) {
struct page *page; struct folio *folio;
ret = btrfs_sb_log_location(device, i, READ, &bytenr); ret = btrfs_sb_log_location(device, i, READ, &bytenr);
if (ret == -ENOENT) { if (ret == -ENOENT) {
@ -3863,27 +3862,29 @@ static int wait_dev_supers(struct btrfs_device *device, int max_mirrors)
device->commit_total_bytes) device->commit_total_bytes)
break; break;
page = find_get_page(device->bdev->bd_inode->i_mapping, folio = filemap_get_folio(device->bdev->bd_inode->i_mapping,
bytenr >> PAGE_SHIFT); bytenr >> PAGE_SHIFT);
if (!page) { if (IS_ERR(folio)) {
errors++; errors++;
if (i == 0) if (i == 0)
primary_failed = true; primary_failed = true;
continue; continue;
} }
/* Page is submitted locked and unlocked once the IO completes */ ASSERT(folio_order(folio) == 0);
wait_on_page_locked(page);
if (PageError(page)) { /* Folio will be unlocked once the write completes. */
folio_wait_locked(folio);
if (folio_test_error(folio)) {
errors++; errors++;
if (i == 0) if (i == 0)
primary_failed = true; primary_failed = true;
} }
/* Drop our reference */ /* Drop our reference */
put_page(page); folio_put(folio);
/* Drop the reference from the writing run */ /* Drop the reference from the writing run */
put_page(page); folio_put(folio);
} }
/* log error, force error return */ /* log error, force error return */