btrfs: simplify btree_submit_bio_start and btrfs_submit_bio_start parameters

After previous patches the unused parameters can be removed from
btree_submit_bio_start and btrfs_submit_bio_start as they don't need to
conform to the extent_submit_bio_start_t typedef.

Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index 72cf235b7beb29cd137c853eec62df7669f7a17f..54bf002e00138f0c9a57076306d971ecbe946105 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -415,8 +415,7 @@ void btrfs_submit_data_write_bio(struct inode *inode, struct bio *bio, int mirro
 void btrfs_submit_data_read_bio(struct inode *inode, struct bio *bio,
                        int mirror_num, enum btrfs_compression_type compress_type);
 void btrfs_submit_dio_repair_bio(struct inode *inode, struct bio *bio, int mirror_num);
-blk_status_t btrfs_submit_bio_start(struct inode *inode, struct bio *bio,
-                                   u64 dio_file_offset);
+blk_status_t btrfs_submit_bio_start(struct inode *inode, struct bio *bio);
 blk_status_t btrfs_submit_bio_start_direct_io(struct inode *inode,
                                              struct bio *bio,
                                              u64 dio_file_offset);

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 394dfe5ff56781a8a1201c05b7a6edb7859adbb8..7bc0fee4da139de60fc6b2e85f261598add53d60 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -639,18 +639,14 @@ static void run_one_async_start(struct btrfs_work *work)
        async = container_of(work, struct  async_submit_bio, work);
        switch (async->submit_cmd) {
        case WQ_SUBMIT_METADATA:
-               ret = btree_submit_bio_start(async->inode, async->bio,
-                                            async->dio_file_offset);
+               ret = btree_submit_bio_start(async->bio);
                break;
        case WQ_SUBMIT_DATA:
-               ret = btrfs_submit_bio_start(async->inode, async->bio,
-                                            async->dio_file_offset);
-
+               ret = btrfs_submit_bio_start(async->inode, async->bio);
                break;
        case WQ_SUBMIT_DATA_DIO:
                ret = btrfs_submit_bio_start_direct_io(async->inode, async->bio,
                                                       async->dio_file_offset);
-
                break;
        }
        if (ret)
@@ -749,8 +745,7 @@ static blk_status_t btree_csum_one_bio(struct bio *bio)
        return errno_to_blk_status(ret);
 }
 
-blk_status_t btree_submit_bio_start(struct inode *inode, struct bio *bio,
-                                   u64 dio_file_offset)
+blk_status_t btree_submit_bio_start(struct bio *bio)
 {
        /*
         * when we're called for a write, we're already in the async

diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h
index 5998b2589830a97bb4237d4c5dcafd7297a75438..d5b25fa8037bc5fb619b39b69264fe1a25d36331 100644 (file)
--- a/fs/btrfs/disk-io.h
+++ b/fs/btrfs/disk-io.h
@@ -122,8 +122,7 @@ enum btrfs_wq_submit_cmd {
 
 bool btrfs_wq_submit_bio(struct inode *inode, struct bio *bio, int mirror_num,
                         u64 dio_file_offset, enum btrfs_wq_submit_cmd cmd);
-blk_status_t btree_submit_bio_start(struct inode *inode, struct bio *bio,
-                                   u64 dio_file_offset);
+blk_status_t btree_submit_bio_start(struct bio *bio);
 int btrfs_alloc_log_tree_node(struct btrfs_trans_handle *trans,
                              struct btrfs_root *root);
 int btrfs_init_log_root_tree(struct btrfs_trans_handle *trans,

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 06931c20ebfa72af3b8b6851daea65cd85a7521a..cd9325f51ffdd8e464cec6be800a6d5d3e30c0b4 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2550,8 +2550,7 @@ void btrfs_clear_delalloc_extent(struct inode *vfs_inode,
  * At IO completion time the cums attached on the ordered extent record
  * are inserted into the btree
  */
-blk_status_t btrfs_submit_bio_start(struct inode *inode, struct bio *bio,
-                                   u64 dio_file_offset)
+blk_status_t btrfs_submit_bio_start(struct inode *inode, struct bio *bio)
 {
        return btrfs_csum_one_bio(BTRFS_I(inode), bio, (u64)-1, false);
 }