diff options
| author | Mark Brown <broonie@kernel.org> | 2026-08-17 16:50:26 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-08-17 16:50:29 +0100 |
| commit | ee358a9da59f60015c605214a6407eab7367683b (patch) | |
| tree | 232ab92d5c97e09f8cb17fe9f25b770d7dae0e6e /net/ceph | |
| parent | f9a3ec2949056d7e0b45c3a588851aef75c10eb7 (diff) | |
| parent | 84213403e316cd75061785ba152941c6d5b7e97d (diff) | |
| download | linux-next-ee358a9da59f60015c605214a6407eab7367683b.tar.gz linux-next-ee358a9da59f60015c605214a6407eab7367683b.zip | |
Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/messenger.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 34b3097b4c7b..9c1b6cf8c36f 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -762,7 +762,7 @@ static bool ceph_msg_data_bio_advance(struct ceph_msg_data_cursor *cursor, if (!cursor->resid) return false; /* no more data */ - if (!bytes || (it->iter.bi_size && it->iter.bi_bvec_done && + if (!bytes || (it->iter.bi_size && it->iter.bi_offset && page == bio_iter_page(it->bio, it->iter))) return false; /* more bytes to process in this segment */ @@ -817,7 +817,7 @@ static bool ceph_msg_data_bvecs_advance(struct ceph_msg_data_cursor *cursor, if (!cursor->resid) return false; /* no more data */ - if (!bytes || (cursor->bvec_iter.bi_bvec_done && + if (!bytes || (cursor->bvec_iter.bi_offset && page == bvec_iter_page(bvecs, cursor->bvec_iter))) return false; /* more bytes to process in this segment */ |