RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-31 07:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12161 from jcsp/wip-remove-cap

Browse Source 
client: simplify remove_cap interface

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
John Spray 2017-01-09 10:30:27 +00:00 committed by GitHub
commit 8a7ad3d9ee
3 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/client/Client.cc
View File

@ -3858,7 +3858,7 @@ void Client::add_update_cap(Inode *in, MetaSession *mds_session, uint64_t cap_id
signal_cond_list(in->waitfor_caps);
}
Cap* Client::remove_cap(Cap *cap, bool queue_release)
void Client::remove_cap(Cap *cap, bool queue_release)
{
Inode *in = cap->inode;
MetaSession *session = cap->session;
@ -3885,13 +3885,9 @@ Cap* Client::remove_cap(Cap *cap, bool queue_release)
assert(in->caps.count(mds));
in->caps.erase(mds);
if (cap == session->s_cap_iterator) {
cap->inode = NULL;
} else {
cap->cap_item.remove_myself();
delete cap;
cap = nullptr;
}
cap->cap_item.remove_myself();
delete cap;
cap = nullptr;
if (!in->is_any_caps()) {
ldout(cct, 15) << "remove_cap last one, closing snaprealm " << in->snaprealm << dendl;
@ -3899,7 +3895,6 @@ Cap* Client::remove_cap(Cap *cap, bool queue_release)
put_snap_realm(in->snaprealm);
in->snaprealm = 0;
}
return cap;
}
void Client::remove_all_caps(Inode *in)
@ -3987,16 +3982,19 @@ void Client::trim_caps(MetaSession *s, int max)
xlist<Cap*>::iterator p = s->caps.begin();
while ((caps_size - trimmed) > max && !p.end()) {
Cap *cap = *p;
s->s_cap_iterator = cap;
Inode *in = cap->inode;
// Increment p early because it will be invalidated if cap
// is deleted inside remove_cap
++p;
if (in->caps.size() > 1 && cap != in->auth_cap) {
int mine = cap->issued | cap->implemented;
int oissued = in->auth_cap ? in->auth_cap->issued : 0;
// disposable non-auth cap
if (!(get_caps_used(in) & ~oissued & mine)) {
ldout(cct, 20) << " removing unused, unneeded non-auth cap on " << *in << dendl;
cap = remove_cap(cap, true);
remove_cap(cap, true);
trimmed++;
}
} else {
@ -4025,14 +4023,7 @@ void Client::trim_caps(MetaSession *s, int max)
trimmed++;
}
}
++p;
if (cap && !cap->inode) {
cap->cap_item.remove_myself();
delete cap;
}
}
s->s_cap_iterator = NULL;
if (s->caps.size() > max)
_invalidate_kernel_dcache();

2
src/client/Client.h
View File

@ -621,7 +621,7 @@ protected:
void add_update_cap(Inode *in, MetaSession *session, uint64_t cap_id,
unsigned issued, unsigned seq, unsigned mseq, inodeno_t realm,
int flags, const UserPerm& perms);
Cap* remove_cap(Cap *cap, bool queue_release);
void remove_cap(Cap *cap, bool queue_release);
void remove_all_caps(Inode *in);
void remove_session_caps(MetaSession *session);
void mark_caps_dirty(Inode *in, int caps);

4
src/client/MetaSession.h
View File

@ -47,15 +47,13 @@ struct MetaSession {
std::set<ceph_tid_t> flushing_caps_tids;
std::set<Inode*> early_flushing_caps;
Cap *s_cap_iterator;
MClientCapRelease *release;
MetaSession()
: mds_num(-1), con(NULL),
seq(0), cap_gen(0), cap_renew_seq(0), num_caps(0),
state(STATE_NEW), mds_state(0), readonly(false),
s_cap_iterator(NULL), release(NULL)
release(NULL)
{}
~MetaSession();