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

objecter: remove the now-unused "registering" flag on LingerOps

Browse Source 
Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Greg Farnum 2012-07-25 17:51:58 -07:00 committed by Sage Weil
parent 06290f6dff
commit d77205d8f9
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osdc/Objecter.cc
View File

@ -286,7 +286,6 @@ void Objecter::send_linger(LingerOp *info)
if (info->session) if (info->session)
s->linger_ops.push_back(&info->session_item); s->linger_ops.push_back(&info->session_item);
} }
info->registering = true;
logger->inc(l_osdc_linger_send); logger->inc(l_osdc_linger_send);
} }
@ -312,7 +311,6 @@ void Objecter::_linger_commit(LingerOp *info, int r)
// only tell the user the first time we do this // only tell the user the first time we do this
info->registered = true; info->registered = true;
info->registering = false;
info->pobjver = NULL; info->pobjver = NULL;
} }

4
src/osdc/Objecter.h
View File

@ -793,7 +793,7 @@ public:
bufferlist *poutbl; bufferlist *poutbl;
eversion_t *pobjver; eversion_t *pobjver;
bool registering, registered; bool registered;
Context *on_reg_ack, *on_reg_commit; Context *on_reg_ack, *on_reg_commit;
OSDSession *session; OSDSession *session;
@ -802,7 +802,7 @@ public:
tid_t register_tid; tid_t register_tid;
LingerOp() : linger_id(0), flags(0), poutbl(NULL), pobjver(NULL), LingerOp() : linger_id(0), flags(0), poutbl(NULL), pobjver(NULL),
registering(false), registered(false), registered(false),
on_reg_ack(NULL), on_reg_commit(NULL), on_reg_ack(NULL), on_reg_commit(NULL),
session(NULL), session_item(this), session(NULL), session_item(this),
register_tid(0) {} register_tid(0) {}