diff options
| author | David Sterba | 2017-02-17 15:59:35 +0100 |
|---|---|---|
| committer | David Sterba | 2017-02-28 14:29:24 +0100 |
| commit | 20c9801d393d9f077c476f40440b481daaccb9d6 (patch) | |
| tree | c7dbce8b7c6908bcfde03baee494d9aa44ddade8 /fs/btrfs | |
| parent | btrfs: document existence of extent_io ops callbacks (diff) | |
| download | kernel-qcow2-linux-20c9801d393d9f077c476f40440b481daaccb9d6.tar.gz kernel-qcow2-linux-20c9801d393d9f077c476f40440b481daaccb9d6.tar.xz kernel-qcow2-linux-20c9801d393d9f077c476f40440b481daaccb9d6.zip | |
btrfs: drop checks for mandatory extent_io_ops callbacks
We know that eadpage_end_io_hook, submit_bio_hook and merge_bio_hook are
always defined so we can drop the checks before we call them.
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/extent_io.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 94beb758e8aa..0786985a8cc5 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2567,8 +2567,7 @@ static void end_bio_extent_readpage(struct bio *bio) len = bvec->bv_len; mirror = io_bio->mirror_num; - if (likely(uptodate && tree->ops && - tree->ops->readpage_end_io_hook)) { + if (likely(uptodate && tree->ops)) { ret = tree->ops->readpage_end_io_hook(io_bio, offset, page, start, end, mirror); @@ -2731,7 +2730,7 @@ static int __must_check submit_one_bio(struct bio *bio, int mirror_num, bio->bi_private = NULL; bio_get(bio); - if (tree->ops && tree->ops->submit_bio_hook) + if (tree->ops) ret = tree->ops->submit_bio_hook(page->mapping->host, bio, mirror_num, bio_flags, start); else @@ -2746,7 +2745,7 @@ static int merge_bio(struct extent_io_tree *tree, struct page *page, unsigned long bio_flags) { int ret = 0; - if (tree->ops && tree->ops->merge_bio_hook) + if (tree->ops) ret = tree->ops->merge_bio_hook(page, offset, size, bio, bio_flags); return ret; |