diff options
| author | Sage Weil <sage@newdream.net> | 2010-06-10 15:50:10 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-08-01 20:11:40 -0700 |
| commit | 796d6955a51ce6768d0e033f27a2f8f5be6cb39a (patch) | |
| tree | 03672d617a25c43ff90f7f627aa2ed0c3f3ed1db | |
| parent | 37151668bad3fd058368752bee476f2ba3645596 (diff) | |
| download | kernel_samsung_espresso10-796d6955a51ce6768d0e033f27a2f8f5be6cb39a.zip kernel_samsung_espresso10-796d6955a51ce6768d0e033f27a2f8f5be6cb39a.tar.gz kernel_samsung_espresso10-796d6955a51ce6768d0e033f27a2f8f5be6cb39a.tar.bz2 | |
ceph: only set num_pages in calc_layout
Setting it elsewhere is unnecessary and more fragile.
Signed-off-by: Sage Weil <sage@newdream.net>
| -rw-r--r-- | fs/ceph/osd_client.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c index e385223..707d2db 100644 --- a/fs/ceph/osd_client.c +++ b/fs/ceph/osd_client.c @@ -1276,8 +1276,6 @@ int ceph_osdc_readpages(struct ceph_osd_client *osdc, /* it may be a short read due to an object boundary */ req->r_pages = pages; - num_pages = calc_pages_for(off, *plen); - req->r_num_pages = num_pages; dout("readpages final extent is %llu~%llu (%d pages)\n", off, *plen, req->r_num_pages); @@ -1319,7 +1317,6 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino, /* it may be a short write due to an object boundary */ req->r_pages = pages; - req->r_num_pages = calc_pages_for(off, len); dout("writepages %llu~%llu (%d pages)\n", off, len, req->r_num_pages); |