diff options
| author | Yan, Zheng <zyan@redhat.com> | 2017-01-19 11:21:29 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-12 06:41:53 +0100 |
| commit | dc8470f3c831c93ffcda17612e8e58a73210b88b (patch) | |
| tree | 29dab873b757d8f184b57fc4798010eb389cf457 | |
| parent | 27ab5414b980b19ba127cb518546d628f40bd3dc (diff) | |
| download | linux-stable-dc8470f3c831c93ffcda17612e8e58a73210b88b.tar.gz linux-stable-dc8470f3c831c93ffcda17612e8e58a73210b88b.tar.bz2 linux-stable-dc8470f3c831c93ffcda17612e8e58a73210b88b.zip | |
ceph: update readpages osd request according to size of pages
commit d641df819db8b80198fd85d9de91137e8a823b07 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/ceph/addr.c | 1 | ||||
| -rw-r--r-- | net/ceph/osd_client.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index ef3ebd780aff..1e643c718917 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -363,6 +363,7 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max) nr_pages = i; if (nr_pages > 0) { len = nr_pages << PAGE_SHIFT; + osd_req_op_extent_update(req, 0, len); break; } goto out_pages; diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index e6ae15bc41b7..0ffeb60cfe67 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); |