Commit 82443fd5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba

btrfs: simplify sync/async submission in btrfs_submit_data_write_bio

btrfs_submit_data_write_bio special cases the reloc root because the
checksums are preloaded, but only does so for the !sync case.  The sync
case can't happen for data relocation, but just handling it more generally
significantly simplifies the logic.
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Tested-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent b9af128d
...@@ -2664,28 +2664,25 @@ void btrfs_submit_data_write_bio(struct inode *inode, struct bio *bio, int mirro ...@@ -2664,28 +2664,25 @@ void btrfs_submit_data_write_bio(struct inode *inode, struct bio *bio, int mirro
} }
/* /*
* Rules for async/sync submit: * If we need to checksum, and the I/O is not issued by fsync and
* a) write without checksum: sync submit * friends, that is ->sync_writers != 0, defer the submission to a
* b) write with checksum: * workqueue to parallelize it.
* b-1) if bio is issued by fsync: sync submit *
* (sync_writers != 0) * Csum items for reloc roots have already been cloned at this point,
* b-2) if root is reloc root: sync submit * so they are handled as part of the no-checksum case.
* (only in case of buffered IO)
* b-3) otherwise: async submit
*/ */
if (!(bi->flags & BTRFS_INODE_NODATASUM) && if (!(bi->flags & BTRFS_INODE_NODATASUM) &&
!test_bit(BTRFS_FS_STATE_NO_CSUMS, &fs_info->fs_state)) { !test_bit(BTRFS_FS_STATE_NO_CSUMS, &fs_info->fs_state) &&
if (atomic_read(&bi->sync_writers)) { !btrfs_is_data_reloc_root(bi->root)) {
ret = btrfs_csum_one_bio(bi, bio, (u64)-1, false); if (!atomic_read(&bi->sync_writers)) {
if (ret)
goto out;
} else if (btrfs_is_data_reloc_root(bi->root)) {
; /* Csum items have already been cloned */
} else {
ret = btrfs_wq_submit_bio(inode, bio, mirror_num, 0, ret = btrfs_wq_submit_bio(inode, bio, mirror_num, 0,
btrfs_submit_bio_start); btrfs_submit_bio_start);
goto out; goto out;
} }
ret = btrfs_csum_one_bio(bi, bio, (u64)-1, false);
if (ret)
goto out;
} }
btrfs_submit_bio(fs_info, bio, mirror_num); btrfs_submit_bio(fs_info, bio, mirror_num);
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment