Skip to content

Commit 011a9a1

Browse files
committed
btrfs: use btrfs_inode in extent_writepage()
As extent_writepage() is internal helper we should use our inode type, so change it from struct inode. Reviewed-by: Johannes Thumshirn <[email protected]> Reviewed-by: Anand Jain <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 06de96f commit 011a9a1

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

fs/btrfs/extent_io.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,15 +1458,15 @@ static noinline_for_stack int extent_writepage_io(struct btrfs_inode *inode,
14581458
*/
14591459
static int extent_writepage(struct folio *folio, struct btrfs_bio_ctrl *bio_ctrl)
14601460
{
1461-
struct inode *inode = folio->mapping->host;
1462-
struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);
1461+
struct btrfs_inode *inode = BTRFS_I(folio->mapping->host);
1462+
struct btrfs_fs_info *fs_info = inode->root->fs_info;
14631463
const u64 page_start = folio_pos(folio);
14641464
int ret;
14651465
size_t pg_offset;
1466-
loff_t i_size = i_size_read(inode);
1466+
loff_t i_size = i_size_read(&inode->vfs_inode);
14671467
unsigned long end_index = i_size >> PAGE_SHIFT;
14681468

1469-
trace_extent_writepage(folio, inode, bio_ctrl->wbc);
1469+
trace_extent_writepage(folio, &inode->vfs_inode, bio_ctrl->wbc);
14701470

14711471
WARN_ON(!folio_test_locked(folio));
14721472

@@ -1490,13 +1490,13 @@ static int extent_writepage(struct folio *folio, struct btrfs_bio_ctrl *bio_ctrl
14901490
if (ret < 0)
14911491
goto done;
14921492

1493-
ret = writepage_delalloc(BTRFS_I(inode), folio, bio_ctrl);
1493+
ret = writepage_delalloc(inode, folio, bio_ctrl);
14941494
if (ret == 1)
14951495
return 0;
14961496
if (ret)
14971497
goto done;
14981498

1499-
ret = extent_writepage_io(BTRFS_I(inode), folio, folio_pos(folio),
1499+
ret = extent_writepage_io(inode, folio, folio_pos(folio),
15001500
PAGE_SIZE, bio_ctrl, i_size);
15011501
if (ret == 1)
15021502
return 0;
@@ -1505,7 +1505,7 @@ static int extent_writepage(struct folio *folio, struct btrfs_bio_ctrl *bio_ctrl
15051505

15061506
done:
15071507
if (ret) {
1508-
btrfs_mark_ordered_io_finished(BTRFS_I(inode), folio,
1508+
btrfs_mark_ordered_io_finished(inode, folio,
15091509
page_start, PAGE_SIZE, !ret);
15101510
mapping_set_error(folio->mapping, ret);
15111511
}

0 commit comments

Comments
 (0)