Skip to content

Commit 80f32ac

Browse files
kdavegregkh
authored andcommitted
btrfs: use btrfs_inode in extent_writepage()
[ Upstream commit 011a9a1 ] 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]> Stable-dep-of: 8bf334b ("btrfs: fix double accounting race when extent_writepage_io() failed") Signed-off-by: Sasha Levin <[email protected]>
1 parent 0138f46 commit 80f32ac

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
@@ -1467,15 +1467,15 @@ static noinline_for_stack int extent_writepage_io(struct btrfs_inode *inode,
14671467
*/
14681468
static int extent_writepage(struct folio *folio, struct btrfs_bio_ctrl *bio_ctrl)
14691469
{
1470-
struct inode *inode = folio->mapping->host;
1471-
struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);
1470+
struct btrfs_inode *inode = BTRFS_I(folio->mapping->host);
1471+
struct btrfs_fs_info *fs_info = inode->root->fs_info;
14721472
const u64 page_start = folio_pos(folio);
14731473
int ret;
14741474
size_t pg_offset;
1475-
loff_t i_size = i_size_read(inode);
1475+
loff_t i_size = i_size_read(&inode->vfs_inode);
14761476
unsigned long end_index = i_size >> PAGE_SHIFT;
14771477

1478-
trace_extent_writepage(folio, inode, bio_ctrl->wbc);
1478+
trace_extent_writepage(folio, &inode->vfs_inode, bio_ctrl->wbc);
14791479

14801480
WARN_ON(!folio_test_locked(folio));
14811481

@@ -1499,13 +1499,13 @@ static int extent_writepage(struct folio *folio, struct btrfs_bio_ctrl *bio_ctrl
14991499
if (ret < 0)
15001500
goto done;
15011501

1502-
ret = writepage_delalloc(BTRFS_I(inode), folio, bio_ctrl);
1502+
ret = writepage_delalloc(inode, folio, bio_ctrl);
15031503
if (ret == 1)
15041504
return 0;
15051505
if (ret)
15061506
goto done;
15071507

1508-
ret = extent_writepage_io(BTRFS_I(inode), folio, folio_pos(folio),
1508+
ret = extent_writepage_io(inode, folio, folio_pos(folio),
15091509
PAGE_SIZE, bio_ctrl, i_size);
15101510
if (ret == 1)
15111511
return 0;
@@ -1514,7 +1514,7 @@ static int extent_writepage(struct folio *folio, struct btrfs_bio_ctrl *bio_ctrl
15141514

15151515
done:
15161516
if (ret) {
1517-
btrfs_mark_ordered_io_finished(BTRFS_I(inode), folio,
1517+
btrfs_mark_ordered_io_finished(inode, folio,
15181518
page_start, PAGE_SIZE, !ret);
15191519
mapping_set_error(folio->mapping, ret);
15201520
}

0 commit comments

Comments
 (0)