diff options
Diffstat (limited to 'fs/ceph/osd_client.c')
| -rw-r--r-- | fs/ceph/osd_client.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c index e38522347898..bed6391e52c7 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, | |||
| 1276 | 1276 | ||
| 1277 | /* it may be a short read due to an object boundary */ | 1277 | /* it may be a short read due to an object boundary */ |
| 1278 | req->r_pages = pages; | 1278 | req->r_pages = pages; |
| 1279 | num_pages = calc_pages_for(off, *plen); | ||
| 1280 | req->r_num_pages = num_pages; | ||
| 1281 | 1279 | ||
| 1282 | dout("readpages final extent is %llu~%llu (%d pages)\n", | 1280 | dout("readpages final extent is %llu~%llu (%d pages)\n", |
| 1283 | off, *plen, req->r_num_pages); | 1281 | off, *plen, req->r_num_pages); |
| @@ -1319,7 +1317,6 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino, | |||
| 1319 | 1317 | ||
| 1320 | /* it may be a short write due to an object boundary */ | 1318 | /* it may be a short write due to an object boundary */ |
| 1321 | req->r_pages = pages; | 1319 | req->r_pages = pages; |
| 1322 | req->r_num_pages = calc_pages_for(off, len); | ||
| 1323 | dout("writepages %llu~%llu (%d pages)\n", off, len, | 1320 | dout("writepages %llu~%llu (%d pages)\n", off, len, |
| 1324 | req->r_num_pages); | 1321 | req->r_num_pages); |
| 1325 | 1322 | ||
| @@ -1476,8 +1473,8 @@ static void put_osd_con(struct ceph_connection *con) | |||
| 1476 | * authentication | 1473 | * authentication |
| 1477 | */ | 1474 | */ |
| 1478 | static int get_authorizer(struct ceph_connection *con, | 1475 | static int get_authorizer(struct ceph_connection *con, |
| 1479 | void **buf, int *len, int *proto, | 1476 | void **buf, int *len, int *proto, |
| 1480 | void **reply_buf, int *reply_len, int force_new) | 1477 | void **reply_buf, int *reply_len, int force_new) |
| 1481 | { | 1478 | { |
| 1482 | struct ceph_osd *o = con->private; | 1479 | struct ceph_osd *o = con->private; |
| 1483 | struct ceph_osd_client *osdc = o->o_osdc; | 1480 | struct ceph_osd_client *osdc = o->o_osdc; |
| @@ -1497,7 +1494,7 @@ static int get_authorizer(struct ceph_connection *con, | |||
| 1497 | &o->o_authorizer_reply_buf, | 1494 | &o->o_authorizer_reply_buf, |
| 1498 | &o->o_authorizer_reply_buf_len); | 1495 | &o->o_authorizer_reply_buf_len); |
| 1499 | if (ret) | 1496 | if (ret) |
| 1500 | return ret; | 1497 | return ret; |
| 1501 | } | 1498 | } |
| 1502 | 1499 | ||
| 1503 | *proto = ac->protocol; | 1500 | *proto = ac->protocol; |
