diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2018-11-22 11:17:49 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-12-17 16:51:41 +0300 |
| commit | 78e62c02abb94e49ea739226a70325a6bf7a6603 (patch) | |
| tree | dddca23b63c11e174d8942be02c6e5e69e031648 /fs/btrfs/inode.c | |
| parent | 7b41ba71c1a08ae35805b562ae5e2f8ddfb8e00d (diff) | |
| download | linux-78e62c02abb94e49ea739226a70325a6bf7a6603.tar.xz | |
btrfs: Remove extent_io_ops::readpage_io_failed_hook
For data inodes this hook does nothing but to return -EAGAIN which is
used to signal to the endio routines that this bio belongs to a data
inode. If this is the case the actual retrying is handled by
bio_readpage_error. Alternatively, if this bio belongs to the btree
inode then btree_io_failed_hook just does some cleanup and doesn't retry
anything.
This patch simplifies the code flow by eliminating
readpage_io_failed_hook and instead open-coding btree_io_failed_hook in
end_bio_extent_readpage. Also eliminate some needless checks since IO is
always performed on either data inode or btree inode, both of which are
guaranteed to have their extent_io_tree::ops set.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 6bfd37e58924..c2c96acaf2fc 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -10409,12 +10409,6 @@ out: return ret; } -__attribute__((const)) -static int btrfs_readpage_io_failed_hook(struct page *page, int failed_mirror) -{ - return -EAGAIN; -} - void btrfs_set_range_writeback(struct extent_io_tree *tree, u64 start, u64 end) { struct inode *inode = tree->private_data; @@ -10810,7 +10804,6 @@ static const struct extent_io_ops btrfs_extent_io_ops = { /* mandatory callbacks */ .submit_bio_hook = btrfs_submit_bio_hook, .readpage_end_io_hook = btrfs_readpage_end_io_hook, - .readpage_io_failed_hook = btrfs_readpage_io_failed_hook, }; /* |