btrfs: Change submit_bio_hook to taking an inode directly

The only possible 'private_data' that is passed to this function is
actually an inode. Make that explicit by changing the signature of the
call back. 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 f5d0517a8563af34dd4d25ebeecf339430a7af27..d41511a05f2eef3c5f5049591230f679dd6b4009 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -885,11 +885,10 @@ static int check_async_write(struct btrfs_inode *bi)
        return 1;
 }
 
-static blk_status_t btree_submit_bio_hook(void *private_data, struct bio *bio,
+static blk_status_t btree_submit_bio_hook(struct inode *inode, struct bio *bio,
                                          int mirror_num, unsigned long bio_flags,
                                          u64 bio_offset)
 {
-       struct inode *inode = private_data;
        struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        int async = check_async_write(BTRFS_I(inode));
        blk_status_t ret;
@@ -915,7 +914,7 @@ static blk_status_t btree_submit_bio_hook(void *private_data, struct bio *bio,
                 * checksumming can happen in parallel across all CPUs
                 */
                ret = btrfs_wq_submit_bio(fs_info, bio, mirror_num, 0,
-                                         bio_offset, private_data,
+                                         bio_offset, inode,
                                          btree_submit_bio_start);
        }
 

diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 79bd20cf42267cbb326b9c3650fc2b50ed06337f..abafb48947efd1110e7ddff368b3a90c5ab3c69d 100644 (file)
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -104,7 +104,7 @@ struct extent_io_ops {
         * The following callbacks must be always defined, the function
         * pointer will be called unconditionally.
         */
-       blk_status_t (*submit_bio_hook)(void *private_data, struct bio *bio,
+       blk_status_t (*submit_bio_hook)(struct inode *inode, struct bio *bio,
                                        int mirror_num, unsigned long bio_flags,
                                        u64 bio_offset);
        int (*readpage_end_io_hook)(struct btrfs_io_bio *io_bio, u64 phy_offset,

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index b998e288366abc0848908f72012b69ba16fbcaa9..130b1c8f546a1209f54b1e612cb8af3d9c7580f2 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1953,11 +1953,10 @@ 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(void *private_data, struct bio *bio,
+static blk_status_t btrfs_submit_bio_hook(struct inode *inode, struct bio *bio,
                                 int mirror_num, unsigned long bio_flags,
                                 u64 bio_offset)
 {
-       struct inode *inode = private_data;
        struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        enum btrfs_wq_endio_type metadata = BTRFS_WQ_ENDIO_DATA;