RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 10:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gh/next'

Browse Source
This commit is contained in:
Sage Weil 2013-04-01 11:52:46 -07:00
commit db7a09507e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/client/Client.cc
View File

@ -1510,6 +1510,7 @@ void Client::_closed_mds_session(MetaSession *s)
{
s->state = MetaSession::STATE_CLOSED;
messenger->mark_down(s->con);
signal_cond_list(s->waiting_for_open);
mount_cond.Signal();
remove_session_caps(s);
kick_requests(s, true);
@ -1543,7 +1544,6 @@ void Client::handle_client_session(MClientSession *m)
case CEPH_SESSION_CLOSE:
_closed_mds_session(session);
signal_cond_list(session->waiting_for_open);
break;
case CEPH_SESSION_RENEWCAPS:
@ -5639,7 +5639,8 @@ int Client::_read(Fh *f, int64_t offset, uint64_t size, bufferlist *bl)
movepos = true;
}
if (!conf->client_debug_force_sync_read && (have & CEPH_CAP_FILE_CACHE)) {
if (!conf->client_debug_force_sync_read &&
(cct->_conf->client_oc && (have & CEPH_CAP_FILE_CACHE))) {
if (f->flags & O_RSYNC) {
_flush_range(in, offset, size);

2
src/librados/AioCompletionImpl.h
View File

@ -47,7 +47,7 @@ struct librados::AioCompletionImpl {
tid_t aio_write_seq;
xlist<AioCompletionImpl*>::item aio_write_list_item;
AioCompletionImpl() : lock("AioCompletionImpl lock"),
AioCompletionImpl() : lock("AioCompletionImpl lock", false, false),
ref(1), rval(0), released(false), ack(false), safe(false),
callback_complete(0), callback_safe(0), callback_arg(0),
is_read(false), pbl(0), buf(0), maxlen(0),