RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 09:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #21322 into master

Browse Source 
* refs/pull/21322/head:
	osdc: cleanup code.
	osdc: Remove useless condition.

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
This commit is contained in:
Patrick Donnelly 2018-04-15 20:26:46 -07:00
commit 9bfce1bfbd
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/osdc/Objecter.cc
View File

@ -1097,9 +1097,7 @@ void Objecter::_scan_requests(
break;
// -- fall-thru --
case RECALC_OP_TARGET_NEED_RESEND:
if (op->session) {
_session_op_remove(op->session, op);
}
_session_op_remove(op->session, op);
need_resend[op->tid] = op;
_op_cancel_map_check(op);
break;
@ -1128,9 +1126,7 @@ void Objecter::_scan_requests(
// -- fall-thru --
case RECALC_OP_TARGET_NEED_RESEND:
need_resend_command[c->tid] = c;
if (c->session) {
_session_command_op_remove(c->session, c);
}
_session_command_op_remove(c->session, c);
_command_cancel_map_check(c);
break;
case RECALC_OP_TARGET_POOL_DNE:
@ -4785,8 +4781,7 @@ void Objecter::handle_command_reply(MCommandReply *m)
<< " not found" << dendl;
m->put();
sl.unlock();
if (s)
s->put();
s->put();
return;
}
@ -4799,8 +4794,7 @@ void Objecter::handle_command_reply(MCommandReply *m)
<< dendl;
m->put();
sl.unlock();
if (s)
s->put();
s->put();
return;
}
if (c->poutbl) {
@ -4812,8 +4806,7 @@ void Objecter::handle_command_reply(MCommandReply *m)
_finish_command(c, m->r, m->rs);
m->put();
if (s)
s->put();
s->put();
}
void Objecter::submit_command(CommandOp *c, ceph_tid_t *ptid)