diff options
| author | Qu Wenruo <wqu@suse.com> | 2026-06-08 12:32:15 +0930 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2026-08-07 19:16:27 +0200 |
| commit | 9366afd43023f45345b34b7dde05c53d71dfd30f (patch) | |
| tree | 194966a397114a6bb7e0aa83168630d5d105b961 | |
| parent | a13307e97d5c54b65720bb71fa379960ded1e51a (diff) | |
btrfs: remove btrfs_dio_data::submitted
This member records how many bytes are submitted for a direct
read/write, utilized by iomap_end() callback to handle short IO cases.
However iomap_end() callback is already providing an internally tracked
@written member, which is doing the same accounting and providing the
same value as btrfs_dio_data::submitted.
There is no need to duplicate the work, just remove btrfs_dio_data::submitted.
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/direct-io.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/btrfs/direct-io.c b/fs/btrfs/direct-io.c index 460326d34143..b2add124cc89 100644 --- a/fs/btrfs/direct-io.c +++ b/fs/btrfs/direct-io.c @@ -14,7 +14,6 @@ #include "ordered-data.h" struct btrfs_dio_data { - ssize_t submitted; loff_t old_isize; struct extent_changeset *data_reserved; struct btrfs_ordered_extent *ordered; @@ -619,7 +618,6 @@ static int btrfs_dio_iomap_end(struct inode *inode, loff_t pos, loff_t length, { struct iomap_iter *iter = container_of(iomap, struct iomap_iter, iomap); struct btrfs_dio_data *dio_data = iter->private; - size_t submitted = dio_data->submitted; const bool write = !!(flags & IOMAP_WRITE); int ret = 0; @@ -630,9 +628,9 @@ static int btrfs_dio_iomap_end(struct inode *inode, loff_t pos, loff_t length, return 0; } - if (submitted < length) { - pos += submitted; - length -= submitted; + if (written < length) { + pos += written; + length -= written; if (write) { /* * Got a short write and have updated the isize, need to @@ -659,7 +657,7 @@ static int btrfs_dio_iomap_end(struct inode *inode, loff_t pos, loff_t length, if (dio_data->updated_isize) { u64 new_isize; - if (submitted == 0) + if (written == 0) new_isize = dio_data->old_isize; else new_isize = max(dio_data->old_isize, pos); @@ -772,8 +770,6 @@ static void btrfs_dio_submit_io(const struct iomap_iter *iter, struct bio *bio, dip->file_offset = file_offset; dip->bytes = bio->bi_iter.bi_size; - dio_data->submitted += bio->bi_iter.bi_size; - /* * Check if we are doing a partial write. If we are, we need to split * the ordered extent to match the submitted bio. Hang on to the |