btrfs: Remove extent_io_ops::readpage_io_failed_hook

Browse source

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>

...

This commit is contained in:

Nikolay Borisov 2018-11-22 10:17:49 +02:00 • committed by David Sterba

parent 7b41ba71c1

commit 78e62c02ab

4 changed files with 35 additions and 60 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

16

fs/btrfs/disk-io.c

View file

71

fs/btrfs/extent_io.c

View file

1

fs/btrfs/extent_io.h

View file

7

fs/btrfs/inode.c

View file