RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-03 23:10:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #24849 into master

Browse Source 
* refs/pull/24849/head:
	client: remove redundant abort logic during dentry invalidation test

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
This commit is contained in:
Patrick Donnelly 2018-11-27 14:23:20 -08:00
commit 3358e3a2d6
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/client/Client.cc
View File

@ -10334,19 +10334,12 @@ int Client::test_dentry_handling(bool can_invalidate)
ceph_assert(dentry_invalidate_cb);
ldout(cct, 1) << "using dentry_invalidate_cb" << dendl;
r = 0;
} else if (remount_cb) {
} else {
ceph_assert(remount_cb);
ldout(cct, 1) << "using remount_cb" << dendl;
r = _do_remount(false);
}
if (r) {
bool should_abort = cct->_conf.get_val<bool>("client_die_on_failed_dentry_invalidate");
if (should_abort) {
lderr(cct) << "no method to invalidate kernel dentry cache; quitting!" << dendl;
ceph_abort();
} else {
lderr(cct) << "no method to invalidate kernel dentry cache; expect issues!" << dendl;
}
}
return r;
}