Commit 5fcdadc2 authored by David Sterba's avatar David Sterba
Browse files

btrfs: pass btrfs_inode to btrfs_wq_submit_bio 



The function is for internal interfaces so we should use the
btrfs_inode.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent bfa17066

fs/btrfs/disk-io.c

+4 −4
Original line number Diff line number Diff line
@@ -698,17 +698,17 @@ static void run_one_async_free(struct btrfs_work *work) 
 * - true if the work has been succesfuly submitted

 * - false in case of error

 */

bool btrfs_wq_submit_bio(struct inode *inode, struct bio *bio, int mirror_num,

bool btrfs_wq_submit_bio(struct btrfs_inode *inode, struct bio *bio, int mirror_num,

			 u64 dio_file_offset, enum btrfs_wq_submit_cmd cmd)

{

	struct btrfs_fs_info *fs_info = BTRFS_I(inode)->root->fs_info;

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	struct async_submit_bio *async;



	async = kmalloc(sizeof(*async), GFP_NOFS);

	if (!async)

		return false;



	async->inode = BTRFS_I(inode);

	async->inode = inode;

	async->bio = bio;

	async->mirror_num = mirror_num;

	async->submit_cmd = cmd;
@@ -784,7 +784,7 @@ void btrfs_submit_metadata_bio(struct inode *inode, struct bio *bio, int mirror_ 
	 * happen in parallel across all CPUs.

	 */

	if (should_async_write(fs_info, BTRFS_I(inode)) &&

	    btrfs_wq_submit_bio(inode, bio, mirror_num, 0, WQ_SUBMIT_METADATA))

	    btrfs_wq_submit_bio(BTRFS_I(inode), bio, mirror_num, 0, WQ_SUBMIT_METADATA))

		return;



	ret = btree_csum_one_bio(bio);

fs/btrfs/disk-io.h

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ enum btrfs_wq_submit_cmd { 
	WQ_SUBMIT_DATA_DIO,

};



bool btrfs_wq_submit_bio(struct inode *inode, struct bio *bio, int mirror_num,

bool btrfs_wq_submit_bio(struct btrfs_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 bio *bio);

int btrfs_alloc_log_tree_node(struct btrfs_trans_handle *trans,

fs/btrfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -2757,7 +2757,7 @@ void btrfs_submit_data_write_bio(struct inode *inode, struct bio *bio, int mirro 
	    !test_bit(BTRFS_FS_STATE_NO_CSUMS, &fs_info->fs_state) &&

	    !btrfs_is_data_reloc_root(bi->root)) {

		if (!atomic_read(&bi->sync_writers) &&

		    btrfs_wq_submit_bio(inode, bio, mirror_num, 0, WQ_SUBMIT_DATA))

		    btrfs_wq_submit_bio(bi, bio, mirror_num, 0, WQ_SUBMIT_DATA))

			return;



		ret = btrfs_csum_one_bio(bi, bio, (u64)-1, false);
@@ -8014,7 +8014,7 @@ static void btrfs_submit_dio_bio(struct bio *bio, struct inode *inode, 
	if (btrfs_op(bio) == BTRFS_MAP_WRITE) {

		/* Check btrfs_submit_data_write_bio() for async submit rules */

		if (async_submit && !atomic_read(&BTRFS_I(inode)->sync_writers) &&

		    btrfs_wq_submit_bio(inode, bio, 0, file_offset,

		    btrfs_wq_submit_bio(BTRFS_I(inode), bio, 0, file_offset,

					WQ_SUBMIT_DATA_DIO))

			return;