Skip to content

Commit 831fa14

Browse files
morbidrsakdave
authored andcommitted
btrfs: use inode from io_ctl in io_ctl_prepare_pages
io_ctl_prepare_pages() gets a 'struct btrfs_io_ctl' as well as a 'struct inode', but btrfs_io_ctl::inode points to the same struct inode as this is assgined in io_ctl_init(). Use the inode form io_ctl to reduce the arguments of io_ctl_prepare_pages. Reviewed-by: Josef Bacik <[email protected]> Signed-off-by: Johannes Thumshirn <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 949964c commit 831fa14

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

fs/btrfs/free-space-cache.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,10 @@ static void io_ctl_drop_pages(struct btrfs_io_ctl *io_ctl)
371371
}
372372
}
373373

374-
static int io_ctl_prepare_pages(struct btrfs_io_ctl *io_ctl, struct inode *inode,
375-
int uptodate)
374+
static int io_ctl_prepare_pages(struct btrfs_io_ctl *io_ctl, int uptodate)
376375
{
377376
struct page *page;
377+
struct inode *inode = io_ctl->inode;
378378
gfp_t mask = btrfs_alloc_write_mask(inode->i_mapping);
379379
int i;
380380

@@ -732,7 +732,7 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
732732

733733
readahead_cache(inode);
734734

735-
ret = io_ctl_prepare_pages(&io_ctl, inode, 1);
735+
ret = io_ctl_prepare_pages(&io_ctl, 1);
736736
if (ret)
737737
goto out;
738738

@@ -1292,7 +1292,7 @@ static int __btrfs_write_out_cache(struct btrfs_root *root, struct inode *inode,
12921292
}
12931293

12941294
/* Lock all pages first so we can lock the extent safely. */
1295-
ret = io_ctl_prepare_pages(io_ctl, inode, 0);
1295+
ret = io_ctl_prepare_pages(io_ctl, 0);
12961296
if (ret)
12971297
goto out_unlock;
12981298

0 commit comments

Comments
 (0)