diff options
| author | Yan, Zheng <zyan@redhat.com> | 2017-01-19 04:21:29 +0100 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2017-02-20 12:16:07 +0100 |
| commit | d641df819db8b80198fd85d9de91137e8a823b07 (patch) | |
| tree | 9d8a8aad955db26b3f160b1d3b2a9a79afdddc14 /net | |
| parent | ceph: fix bogus endianness change in ceph_ioctl_set_layout (diff) | |
| download | linux-d641df819db8b80198fd85d9de91137e8a823b07.tar.xz linux-d641df819db8b80198fd85d9de91137e8a823b07.zip | |
ceph: update readpages osd request according to size of pages
add_to_page_cache_lru() can fails, so the actual pages to read
can be smaller than the initial size of osd request. We need to
update osd request size in that case.
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/osd_client.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 842f049abb86..3a2417bb6ff0 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -672,7 +672,8 @@ void osd_req_op_extent_update(struct ceph_osd_request *osd_req, BUG_ON(length > previous); op->extent.length = length; - op->indata_len -= previous - length; + if (op->op == CEPH_OSD_OP_WRITE || op->op == CEPH_OSD_OP_WRITEFULL) + op->indata_len -= previous - length; } EXPORT_SYMBOL(osd_req_op_extent_update); |