btrfs: Remove bio_offset argument from submit_bio_hook

None of the implementers of the submit_bio_hook use the bio_offset
parameter, simply remove it. No functional changes.

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index adc492848619262b78f9cb237bedb8d1a0bbbf2c..eb26b3239827f7d219f04b55644d002f434ebce1 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -885,8 +885,8 @@ static int check_async_write(struct btrfs_inode *bi)
 }
 
 static blk_status_t btree_submit_bio_hook(struct inode *inode, struct bio *bio,
-                                         int mirror_num, unsigned long bio_flags,
-                                         u64 bio_offset)
+                                         int mirror_num,
+                                         unsigned long bio_flags)
 {
        struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        int async = check_async_write(BTRFS_I(inode));

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 048d6c6fe7b9bd815d47ee3ed3df26fa7ccad6b2..9aa79ad794c9dd735ed54be9c4ab57b911006e12 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -149,19 +149,13 @@ static int __must_check submit_one_bio(struct bio *bio, int mirror_num,
                                       unsigned long bio_flags)
 {
        blk_status_t ret = 0;
-       struct bio_vec *bvec = bio_last_bvec_all(bio);
-       struct bio_vec bv;
        struct extent_io_tree *tree = bio->bi_private;
-       u64 start;
-
-       mp_bvec_last_segment(bvec, &bv);
-       start = page_offset(bv.bv_page) + bv.bv_offset;
 
        bio->bi_private = NULL;
 
        if (tree->ops)
                ret = tree->ops->submit_bio_hook(tree->private_data, bio,
-                                          mirror_num, bio_flags, start);
+                                                mirror_num, bio_flags);
        else
                btrfsic_submit_bio(bio);
 
@@ -2546,7 +2540,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset,
                read_mode, failrec->this_mirror, failrec->in_validation);
 
        status = tree->ops->submit_bio_hook(tree->private_data, bio, failrec->this_mirror,
-                                        failrec->bio_flags, 0);
+                                        failrec->bio_flags);
        if (status) {
                free_io_failure(failure_tree, tree, failrec);
                bio_put(bio);

diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 37240e03c4e3935b31a724f7a2a8e81f83b1a7d9..aa18a16a6ed739e42bc6a96ce76c9c7fcf355a02 100644 (file)
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -105,8 +105,7 @@ struct extent_io_ops {
         * pointer will be called unconditionally.
         */
        blk_status_t (*submit_bio_hook)(struct inode *inode, struct bio *bio,
-                                       int mirror_num, unsigned long bio_flags,
-                                       u64 bio_offset);
+                                       int mirror_num, unsigned long bio_flags);
        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 1e7e8421e524fa566227091e3880e950c98a6c23..837fd573991a538ba8eb473a423bb1c5cb4f25c1 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1954,8 +1954,9 @@ static blk_status_t btrfs_submit_bio_start(void *private_data, struct bio *bio,
  *    c-3) otherwise:                  async submit
  */
 static blk_status_t btrfs_submit_bio_hook(struct inode *inode, struct bio *bio,
-                                int mirror_num, unsigned long bio_flags,
-                                u64 bio_offset)
+                                         int mirror_num,
+                                         unsigned long bio_flags)
+
 {
        struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;