From: Nikolay Borisov <nborisov@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: Nikolay Borisov <nborisov@suse.com>
Subject: [PATCH 2/7] btrfs: Remove extent_io_ops::readpage_end_io_hook
Date: Fri, 18 Sep 2020 16:34:34 +0300 [thread overview]
Message-ID: <20200918133439.23187-3-nborisov@suse.com> (raw)
In-Reply-To: <20200918133439.23187-1-nborisov@suse.com>
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(-)
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
};
/*
--
2.17.1
next prev parent reply other threads:[~2020-09-18 13:34 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-18 13:34 [PATCH 0/7] Remove struct extent_io_ops Nikolay Borisov
2020-09-18 13:34 ` [PATCH 1/7] btrfs: Don't call readpage_end_io_hook for the btree inode Nikolay Borisov
2020-09-18 13:41 ` Nikolay Borisov
2020-09-21 14:54 ` Johannes Thumshirn
2020-09-21 17:45 ` David Sterba
2020-09-23 6:29 ` Nikolay Borisov
2020-09-23 14:10 ` David Sterba
2020-09-18 13:34 ` Nikolay Borisov [this message]
2020-09-21 14:58 ` [PATCH 2/7] btrfs: Remove extent_io_ops::readpage_end_io_hook Johannes Thumshirn
2020-09-18 13:34 ` [PATCH 3/7] btrfs: Call submit_bio_hook directly in submit_one_bio Nikolay Borisov
2020-09-18 13:34 ` [PATCH 4/7] btrfs: Don't opencode is_data_inode in end_bio_extent_readpage Nikolay Borisov
2020-09-21 20:29 ` David Sterba
2020-09-23 6:23 ` Nikolay Borisov
2020-09-23 14:11 ` David Sterba
2020-09-18 13:34 ` [PATCH 5/7] btrfs: Stop calling submit_bio_hook for data inodes Nikolay Borisov
2020-09-18 13:34 ` [PATCH 6/7] btrfs: Call submit_bio_hook directly for metadata pages Nikolay Borisov
2020-09-21 15:04 ` Johannes Thumshirn
2020-09-21 20:32 ` David Sterba
2020-09-23 6:24 ` Nikolay Borisov
2020-09-18 13:34 ` [PATCH 7/7] btrfs: Remove struct extent_io_ops Nikolay Borisov
2020-09-21 20:38 ` David Sterba
2020-09-23 6:25 ` Nikolay Borisov
2020-09-23 14:19 ` David Sterba
2020-09-23 14:23 ` Nikolay Borisov
2020-09-23 15:09 ` David Sterba
2020-09-21 15:05 ` [PATCH 0/7] " Johannes Thumshirn
2020-09-24 11:35 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200918133439.23187-3-nborisov@suse.com \
--to=nborisov@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox