RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #26460 into master

Browse Source 
* refs/pull/26460/head:
	client: parameter "cap" is not used

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
This commit is contained in:
Patrick Donnelly 2019-03-05 06:25:19 -08:00
commit 8a85bd2731
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/Client.cc
View File

@ -3958,7 +3958,7 @@ void Client::_flushed(Inode *in)
// checks common to add_update_cap, handle_cap_grant
void Client::check_cap_issue(Inode *in, Cap *cap, unsigned issued)
void Client::check_cap_issue(Inode *in, unsigned issued)
{
unsigned had = in->caps_issued();
@ -4022,7 +4022,7 @@ void Client::add_update_cap(Inode *in, MetaSession *mds_session, uint64_t cap_id
}
}
check_cap_issue(in, &cap, issued);
check_cap_issue(in, issued);
if (flags & CEPH_CAP_FLAG_AUTH) {
if (in->auth_cap != &cap &&
@ -5162,7 +5162,7 @@ void Client::handle_cap_grant(MetaSession *session, Inode *in, Cap *cap, const M
cap->seq = m->get_seq();
cap->gen = session->cap_gen;
check_cap_issue(in, cap, new_caps);
check_cap_issue(in, new_caps);
// update inode
int issued;

2
src/client/Client.h
View File

@ -642,7 +642,7 @@ public:
int uninline_data(Inode *in, Context *onfinish);
// file caps
void check_cap_issue(Inode *in, Cap *cap, unsigned issued);
void check_cap_issue(Inode *in, unsigned issued);
void add_update_cap(Inode *in, MetaSession *session, uint64_t cap_id,
unsigned issued, unsigned wanted, unsigned seq, unsigned mseq,
inodeno_t realm, int flags, const UserPerm& perms);