diff options
| author | Sage Weil <sage@newdream.net> | 2011-06-13 16:20:18 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-06-13 16:26:17 -0700 |
| commit | 9bb0ce2b0b734f3325ea5cd6b351856eeac94f78 (patch) | |
| tree | afd4c5d343ddfabae8c3b78bff342f6ba6037055 | |
| parent | 773e9b442693b250aa6c452cb0cf5a9343f51cef (diff) | |
| download | kernel_samsung_smdk4412-9bb0ce2b0b734f3325ea5cd6b351856eeac94f78.tar.gz kernel_samsung_smdk4412-9bb0ce2b0b734f3325ea5cd6b351856eeac94f78.tar.bz2 kernel_samsung_smdk4412-9bb0ce2b0b734f3325ea5cd6b351856eeac94f78.zip | |
libceph: fix page calculation for non-page-aligned io
Set the page count correctly for non-page-aligned IO. We were already
doing this correctly for alignment, but not the page count. Fixes
DIRECT_IO writes from unaligned pages.
Signed-off-by: Sage Weil <sage@newdream.net>
| -rw-r--r-- | net/ceph/osd_client.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 9cb627a4073..7330c2757c0 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -477,8 +477,9 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc, calc_layout(osdc, vino, layout, off, plen, req, ops); req->r_file_layout = *layout; /* keep a copy */ - /* in case it differs from natural alignment that calc_layout - filled in for us */ + /* in case it differs from natural (file) alignment that + calc_layout filled in for us */ + req->r_num_pages = calc_pages_for(page_align, *plen); req->r_page_alignment = page_align; ceph_osdc_build_request(req, off, plen, ops, @@ -2027,8 +2028,9 @@ static struct ceph_msg *get_reply(struct ceph_connection *con, int want = calc_pages_for(req->r_page_alignment, data_len); if (unlikely(req->r_num_pages < want)) { - pr_warning("tid %lld reply %d > expected %d pages\n", - tid, want, m->nr_pages); + pr_warning("tid %lld reply has %d bytes %d pages, we" + " had only %d pages ready\n", tid, data_len, + want, req->r_num_pages); *skip = 1; ceph_msg_put(m); m = NULL; |