From 232d12f03612983336a2e90cb024deb79e5e6934 Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Wed, 31 Oct 2018 02:47:24 -0400 Subject: [PATCH] client: remove redundant abort logic during dentry invalidation test commit d1471f070c added retry logic when remounting is used to invalidate kernel dcache. ceph-fuse performs a dcache invalidation test during startup, thereby logging (and continuing) or aborting as per certain configuration settings. the abort logic is pretty much redundant and can be cleaned up preserving the existing behavior. Also, assert is none of dcache invalidation mecahnisms (`dentry_invalidate_cb` or `remount_cb`) are available. Signed-off-by: Venky Shankar --- src/client/Client.cc | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 426abac9cfe..a1a0866c347 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -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("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; } -- 2.47.3