diff mbox series

[2/7] btrfs: Remove extent_io_ops::readpage_end_io_hook

Message ID 20200918133439.23187-3-nborisov@suse.com (mailing list archive)
State New, archived
Headers show
Series Remove struct extent_io_ops | expand

Commit Message

Nikolay Borisov Sept. 18, 2020, 1:34 p.m. UTC 
It's no longer used so let's remove it.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
 fs/btrfs/disk-io.c   | 4 +---
 fs/btrfs/extent_io.h | 5 +----
 fs/btrfs/inode.c     | 4 +---
 3 files changed, 3 insertions(+), 10 deletions(-)

Comments

Johannes Thumshirn Sept. 21, 2020, 2:58 p.m. UTC | #1 
And here it is. I think these two patches can be merged.
diff mbox series

Patch

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 5ad11c38230f..73937954f464 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -4637,7 +4637,5 @@  static int btrfs_cleanup_transaction(struct btrfs_fs_info *fs_info)
 }
 
 static const struct extent_io_ops btree_extent_io_ops = {
-	/* mandatory callbacks */
-	.submit_bio_hook = btree_submit_bio_hook,
-	.readpage_end_io_hook = NULL
+	.submit_bio_hook = btree_submit_bio_hook
 };
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 133487a5e6b8..d9119bd555a9 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -77,13 +77,10 @@  typedef blk_status_t (extent_submit_bio_start_t)(void *private_data,
 
 struct extent_io_ops {
 	/*
-	 * The following callbacks must be always defined, the function
+	 * The following callback must be always defined, the function
 	 * pointer will be called unconditionally.
 	 */
 	submit_bio_hook_t *submit_bio_hook;
-	int (*readpage_end_io_hook)(struct btrfs_io_bio *io_bio, u64 phy_offset,
-				    struct page *page, u64 start, u64 end,
-				    int mirror);
 };
 
 
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 23ac09aa813e..41565c5a05ef 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -10246,9 +10246,7 @@  static const struct file_operations btrfs_dir_file_operations = {
 };
 
 static const struct extent_io_ops btrfs_extent_io_ops = {
-	/* mandatory callbacks */
-	.submit_bio_hook = btrfs_submit_bio_hook,
-	.readpage_end_io_hook = NULL
+	.submit_bio_hook = btrfs_submit_bio_hook
 };
 
 /*