btrfs: make btrfs_csum_one_bio takae btrfs_inode

Will enable converting btrfs_submit_compressed_write to btrfs_inode more
easily.

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/compression.c b/fs/btrfs/compression.c
index c6e648603f85a0e203fab5d2c76ebf29aee55dd4..4f52cd8af517ffa0716985386175b1130cce62ae 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -475,7 +475,8 @@ blk_status_t btrfs_submit_compressed_write(struct inode *inode, u64 start,
                        BUG_ON(ret); /* -ENOMEM */
 
                        if (!skip_sum) {
-                               ret = btrfs_csum_one_bio(inode, bio, start, 1);
+                               ret = btrfs_csum_one_bio(BTRFS_I(inode), bio,
+                                                        start, 1);
                                BUG_ON(ret); /* -ENOMEM */
                        }
 
@@ -507,7 +508,7 @@ blk_status_t btrfs_submit_compressed_write(struct inode *inode, u64 start,
        BUG_ON(ret); /* -ENOMEM */
 
        if (!skip_sum) {
-               ret = btrfs_csum_one_bio(inode, bio, start, 1);
+               ret = btrfs_csum_one_bio(BTRFS_I(inode), bio, start, 1);
                BUG_ON(ret); /* -ENOMEM */
        }
 

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 8fd063ca081b7f1cc586f4070076df00c8bef6b9..37db9753fc8451764452dc7f6b5aecf56191a159 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2883,8 +2883,8 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,
 int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
                           struct btrfs_root *root,
                           struct btrfs_ordered_sum *sums);
-blk_status_t btrfs_csum_one_bio(struct inode *inode, struct bio *bio,
-                      u64 file_start, int contig);
+blk_status_t btrfs_csum_one_bio(struct btrfs_inode *inode, struct bio *bio,
+                               u64 file_start, int contig);
 int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
                             struct list_head *list, int search_commit);
 void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode,

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index 9d311e834b207472c7e555085dd15ac3eb4fe844..7d5ec71615b8f0d6d0f8e0ae18285f7078fa64f6 100644 (file)
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -522,10 +522,9 @@ fail:
  *              means this bio can contains potentially discontigous bio vecs
  *              so the logical offset of each should be calculated separately.
  */
-blk_status_t btrfs_csum_one_bio(struct inode *vfsinode, struct bio *bio,
+blk_status_t btrfs_csum_one_bio(struct btrfs_inode *inode, struct bio *bio,
                       u64 file_start, int contig)
 {
-       struct btrfs_inode *inode = BTRFS_I(vfsinode);
        struct btrfs_fs_info *fs_info = inode->root->fs_info;
        SHASH_DESC_ON_STACK(shash, fs_info->csum_shash);
        struct btrfs_ordered_sum *sums;

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index cab56c37ec39153bd793df2fcfc02d1eeea446aa..d0af2027f8985be751ea40080dabd9008620e58a 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2167,7 +2167,7 @@ static blk_status_t btrfs_submit_bio_start(void *private_data, struct bio *bio,
        struct inode *inode = private_data;
        blk_status_t ret = 0;
 
-       ret = btrfs_csum_one_bio(inode, bio, 0, 0);
+       ret = btrfs_csum_one_bio(BTRFS_I(inode), bio, 0, 0);
        BUG_ON(ret); /* -ENOMEM */
        return 0;
 }
@@ -2232,7 +2232,7 @@ static blk_status_t btrfs_submit_bio_hook(struct inode *inode, struct bio *bio,
                                          0, inode, btrfs_submit_bio_start);
                goto out;
        } else if (!skip_sum) {
-               ret = btrfs_csum_one_bio(inode, bio, 0, 0);
+               ret = btrfs_csum_one_bio(BTRFS_I(inode), bio, 0, 0);
                if (ret)
                        goto out;
        }
@@ -7572,7 +7572,7 @@ static blk_status_t btrfs_submit_bio_start_direct_io(void *private_data,
 {
        struct inode *inode = private_data;
        blk_status_t ret;
-       ret = btrfs_csum_one_bio(inode, bio, offset, 1);
+       ret = btrfs_csum_one_bio(BTRFS_I(inode), bio, offset, 1);
        BUG_ON(ret); /* -ENOMEM */
        return 0;
 }
@@ -7633,7 +7633,7 @@ static inline blk_status_t btrfs_submit_dio_bio(struct bio *bio,
                 * If we aren't doing async submit, calculate the csum of the
                 * bio now.
                 */
-               ret = btrfs_csum_one_bio(inode, bio, file_offset, 1);
+               ret = btrfs_csum_one_bio(BTRFS_I(inode), bio, file_offset, 1);
                if (ret)
                        goto err;
        } else {