From 3b3b9ee9cb094849862b0e61eead5c1be2ca9be7 Mon Sep 17 00:00:00 2001 From: Supriti Singh Date: Fri, 20 Apr 2018 09:48:53 +0200 Subject: [PATCH] client: avoid second lock on client_lock Avoid a second nested lock on client lock. As a result, drop unused function ll_get_inodeno(). Fixes: https://tracker.ceph.com/issues/23815 Signed-off-by: Supriti Singh (cherry picked from commit 7be8d559a11507255f847ce6279d23abaabde70a) --- src/client/Client.cc | 2 +- src/client/Client.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 1fd435839490..f1520c487452 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -12395,7 +12395,7 @@ int Client::ll_get_stripe_osd(Inode *in, uint64_t blockno, { Mutex::Locker lock(client_lock); - inodeno_t ino = ll_get_inodeno(in); + inodeno_t ino = in->ino; uint32_t object_size = layout->object_size; uint32_t su = layout->stripe_unit; uint32_t stripe_count = layout->stripe_count; diff --git a/src/client/Client.h b/src/client/Client.h index 0d7cd787bad1..b0e1361415c7 100644 --- a/src/client/Client.h +++ b/src/client/Client.h @@ -1130,11 +1130,6 @@ public: int get_caps_issued(int fd); int get_caps_issued(const char *path, const UserPerm& perms); - // low-level interface v2 - inodeno_t ll_get_inodeno(Inode *in) { - Mutex::Locker lock(client_lock); - return _get_inodeno(in); - } snapid_t ll_get_snapid(Inode *in); vinodeno_t ll_get_vino(Inode *in) { Mutex::Locker lock(client_lock); -- 2.47.3