btrfs: merge btrfs_submit_bio_done to its caller (06ea01b1) · Commits · 戴 / test

fs/btrfs/disk-io.c

+17 −1

Original line number	Diff line number	Diff line
		@@ -764,11 +764,22 @@ static void run_one_async_start(struct btrfs_work *work)
		async->status = ret;
		}

		/*
		* In order to insert checksums into the metadata in large chunks, we wait
		* until bio submission time. All the pages in the bio are checksummed and
		* sums are attached onto the ordered extent record.
		*
		* At IO completion time the csums attached on the ordered extent record are
		* inserted into the tree.
		*/
		static void run_one_async_done(struct btrfs_work *work)
		{
		struct async_submit_bio *async;
		struct inode *inode;
		blk_status_t ret;

		async = container_of(work, struct async_submit_bio, work);
		inode = async->private_data;

		/* If an error occurred we just want to clean up the bio and move on */
		if (async->status) {
		@@ -777,7 +788,12 @@ static void run_one_async_done(struct btrfs_work *work)
		return;
		}

		btrfs_submit_bio_done(async->private_data, async->bio, async->mirror_num);
		ret = btrfs_map_bio(btrfs_sb(inode->i_sb), async->bio,
		async->mirror_num, 1);
		if (ret) {
		async->bio->bi_status = ret;
		bio_endio(async->bio);
		}
		}

		static void run_one_async_free(struct btrfs_work *work)

+0 −23

Original line number	Diff line number	Diff line
		@@ -1924,29 +1924,6 @@ static blk_status_t btrfs_submit_bio_start(void private_data, struct bio bio,
		return 0;
		}

		/*
		* in order to insert checksums into the metadata in large chunks,
		* we wait until bio submission time. All the pages in the bio are
		* checksummed and sums are attached onto the ordered extent record.
		*
		* At IO completion time the cums attached on the ordered extent record
		* are inserted into the btree
		*/
		blk_status_t btrfs_submit_bio_done(void private_data, struct bio bio,
		int mirror_num)
		{
		struct inode *inode = private_data;
		struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
		blk_status_t ret;

		ret = btrfs_map_bio(fs_info, bio, mirror_num, 1);
		if (ret) {
		bio->bi_status = ret;
		bio_endio(bio);
		}
		return ret;
		}

		/*
		* extent_io.c submission hook. This does the right thing for csum calculation
		* on write, or reading the csums from the tree before a read.