Skip to content

Commit c629732

Browse files
lorddoskiaskdave
authored andcommitted
btrfs: Remove unused extent_state argument from btrfs_writepage_endio_finish_ordered
This parameter was never used, yet was part of the interface of the function ever since its introduction as extent_io_ops::writepage_end_io_hook in e6dcd2d ("Btrfs: New data=ordered implementation"). Now that NULL is passed everywhere as a value for this parameter let's remove it for good. No functional changes. Signed-off-by: Nikolay Borisov <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 8cc0237 commit c629732

File tree

4 files changed

+11
-14
lines changed

4 files changed

+11
-14
lines changed

fs/btrfs/compression.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ static void end_compressed_bio_write(struct bio *bio)
249249
inode = cb->inode;
250250
cb->compressed_pages[0]->mapping = cb->inode->i_mapping;
251251
btrfs_writepage_endio_finish_ordered(cb->compressed_pages[0],
252-
cb->start, cb->start + cb->len - 1, NULL,
252+
cb->start, cb->start + cb->len - 1,
253253
bio->bi_status ? BLK_STS_OK : BLK_STS_NOTSUPP);
254254
cb->compressed_pages[0]->mapping = NULL;
255255

fs/btrfs/ctree.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3179,7 +3179,7 @@ int btrfs_create_subvol_root(struct btrfs_trans_handle *trans,
31793179
struct btrfs_root *new_root,
31803180
struct btrfs_root *parent_root,
31813181
u64 new_dirid);
3182-
void btrfs_set_delalloc_extent(struct inode *inode, struct extent_state *state,
3182+
void btrfs_set_delalloc_extent(struct inode *inode, struct extent_state *state,
31833183
unsigned *bits);
31843184
void btrfs_clear_delalloc_extent(struct inode *inode,
31853185
struct extent_state *state, unsigned *bits);
@@ -3231,7 +3231,7 @@ int btrfs_run_delalloc_range(void *private_data, struct page *locked_page,
32313231
struct writeback_control *wbc);
32323232
int btrfs_writepage_cow_fixup(struct page *page, u64 start, u64 end);
32333233
void btrfs_writepage_endio_finish_ordered(struct page *page, u64 start,
3234-
u64 end, struct extent_state *state, int uptodate);
3234+
u64 end, int uptodate);
32353235
extern const struct dentry_operations btrfs_dentry_operations;
32363236

32373237
/* ioctl.c */

fs/btrfs/extent_io.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2407,7 +2407,7 @@ void end_extent_writepage(struct page *page, int err, u64 start, u64 end)
24072407
int uptodate = (err == 0);
24082408
int ret = 0;
24092409

2410-
btrfs_writepage_endio_finish_ordered(page, start, end, NULL, uptodate);
2410+
btrfs_writepage_endio_finish_ordered(page, start, end, uptodate);
24112411

24122412
if (!uptodate) {
24132413
ClearPageUptodate(page);
@@ -3326,8 +3326,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,
33263326

33273327
end = page_end;
33283328
if (i_size <= start) {
3329-
btrfs_writepage_endio_finish_ordered(page, start, page_end,
3330-
NULL, 1);
3329+
btrfs_writepage_endio_finish_ordered(page, start, page_end, 1);
33313330
goto done;
33323331
}
33333332

@@ -3339,7 +3338,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,
33393338

33403339
if (cur >= i_size) {
33413340
btrfs_writepage_endio_finish_ordered(page, cur,
3342-
page_end, NULL, 1);
3341+
page_end, 1);
33433342
break;
33443343
}
33453344
em = btrfs_get_extent(BTRFS_I(inode), page, pg_offset, cur,
@@ -3376,7 +3375,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,
33763375
if (!compressed)
33773376
btrfs_writepage_endio_finish_ordered(page, cur,
33783377
cur + iosize - 1,
3379-
NULL, 1);
3378+
1);
33803379
else if (compressed) {
33813380
/* we don't want to end_page_writeback on
33823381
* a compressed extent. this happens
@@ -4063,8 +4062,7 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end,
40634062
ret = __extent_writepage(page, &wbc_writepages, &epd);
40644063
else {
40654064
btrfs_writepage_endio_finish_ordered(page, start,
4066-
start + PAGE_SIZE - 1,
4067-
NULL, 1);
4065+
start + PAGE_SIZE - 1, 1);
40684066
unlock_page(page);
40694067
}
40704068
put_page(page);

fs/btrfs/inode.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -853,8 +853,7 @@ static noinline void submit_compressed_extents(struct inode *inode,
853853
const u64 end = start + async_extent->ram_size - 1;
854854

855855
p->mapping = inode->i_mapping;
856-
btrfs_writepage_endio_finish_ordered(p, start, end,
857-
NULL, 0);
856+
btrfs_writepage_endio_finish_ordered(p, start, end, 0);
858857

859858
p->mapping = NULL;
860859
extent_clear_unlock_delalloc(inode, start, end, end,
@@ -3153,8 +3152,8 @@ static void finish_ordered_fn(struct btrfs_work *work)
31533152
btrfs_finish_ordered_io(ordered_extent);
31543153
}
31553154

3156-
void btrfs_writepage_endio_finish_ordered(struct page *page, u64 start, u64 end,
3157-
struct extent_state *state, int uptodate)
3155+
void btrfs_writepage_endio_finish_ordered(struct page *page, u64 start,
3156+
u64 end, int uptodate)
31583157
{
31593158
struct inode *inode = page->mapping->host;
31603159
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);

0 commit comments

Comments
 (0)