Commit 8edf84ba authored by Ilya Dryomov's avatar Ilya Dryomov

libceph: drop unused con parameter of calc_target()

This bit was omitted from a5613724 ("libceph: fix PG split vs OSD
(re)connect race") to avoid backport conflicts.
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 96ac9158
...@@ -1505,7 +1505,6 @@ enum calc_target_result { ...@@ -1505,7 +1505,6 @@ enum calc_target_result {
static enum calc_target_result calc_target(struct ceph_osd_client *osdc, static enum calc_target_result calc_target(struct ceph_osd_client *osdc,
struct ceph_osd_request_target *t, struct ceph_osd_request_target *t,
struct ceph_connection *con,
bool any_change) bool any_change)
{ {
struct ceph_pg_pool_info *pi; struct ceph_pg_pool_info *pi;
...@@ -2289,7 +2288,7 @@ static void __submit_request(struct ceph_osd_request *req, bool wrlocked) ...@@ -2289,7 +2288,7 @@ static void __submit_request(struct ceph_osd_request *req, bool wrlocked)
dout("%s req %p wrlocked %d\n", __func__, req, wrlocked); dout("%s req %p wrlocked %d\n", __func__, req, wrlocked);
again: again:
ct_res = calc_target(osdc, &req->r_t, NULL, false); ct_res = calc_target(osdc, &req->r_t, false);
if (ct_res == CALC_TARGET_POOL_DNE && !wrlocked) if (ct_res == CALC_TARGET_POOL_DNE && !wrlocked)
goto promote; goto promote;
...@@ -3112,7 +3111,7 @@ static void linger_submit(struct ceph_osd_linger_request *lreq) ...@@ -3112,7 +3111,7 @@ static void linger_submit(struct ceph_osd_linger_request *lreq)
lreq->reg_req->r_ops[0].notify.cookie = lreq->linger_id; lreq->reg_req->r_ops[0].notify.cookie = lreq->linger_id;
} }
calc_target(osdc, &lreq->t, NULL, false); calc_target(osdc, &lreq->t, false);
osd = lookup_create_osd(osdc, lreq->t.osd, true); osd = lookup_create_osd(osdc, lreq->t.osd, true);
link_linger(osd, lreq); link_linger(osd, lreq);
...@@ -3729,7 +3728,7 @@ recalc_linger_target(struct ceph_osd_linger_request *lreq) ...@@ -3729,7 +3728,7 @@ recalc_linger_target(struct ceph_osd_linger_request *lreq)
struct ceph_osd_client *osdc = lreq->osdc; struct ceph_osd_client *osdc = lreq->osdc;
enum calc_target_result ct_res; enum calc_target_result ct_res;
ct_res = calc_target(osdc, &lreq->t, NULL, true); ct_res = calc_target(osdc, &lreq->t, true);
if (ct_res == CALC_TARGET_NEED_RESEND) { if (ct_res == CALC_TARGET_NEED_RESEND) {
struct ceph_osd *osd; struct ceph_osd *osd;
...@@ -3801,8 +3800,7 @@ static void scan_requests(struct ceph_osd *osd, ...@@ -3801,8 +3800,7 @@ static void scan_requests(struct ceph_osd *osd,
n = rb_next(n); /* unlink_request(), check_pool_dne() */ n = rb_next(n); /* unlink_request(), check_pool_dne() */
dout("%s req %p tid %llu\n", __func__, req, req->r_tid); dout("%s req %p tid %llu\n", __func__, req, req->r_tid);
ct_res = calc_target(osdc, &req->r_t, &req->r_osd->o_con, ct_res = calc_target(osdc, &req->r_t, false);
false);
switch (ct_res) { switch (ct_res) {
case CALC_TARGET_NO_ACTION: case CALC_TARGET_NO_ACTION:
force_resend_writes = cleared_full || force_resend_writes = cleared_full ||
...@@ -3911,7 +3909,7 @@ static void kick_requests(struct ceph_osd_client *osdc, ...@@ -3911,7 +3909,7 @@ static void kick_requests(struct ceph_osd_client *osdc,
n = rb_next(n); n = rb_next(n);
if (req->r_t.epoch < osdc->osdmap->epoch) { if (req->r_t.epoch < osdc->osdmap->epoch) {
ct_res = calc_target(osdc, &req->r_t, NULL, false); ct_res = calc_target(osdc, &req->r_t, false);
if (ct_res == CALC_TARGET_POOL_DNE) { if (ct_res == CALC_TARGET_POOL_DNE) {
erase_request(need_resend, req); erase_request(need_resend, req);
check_pool_dne(req); check_pool_dne(req);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment