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 <supriti.singh@suse.com>
(cherry picked from commit 7be8d559a11507255f847ce6279d23abaabde70a)

 Conflicts:
	src/client/Client.cc (dropped function call ll_get_inodeno(in))

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 2d3284b76dce8d0cfa1002e1a3de1d1a8938c862..319afc2210faec3ad177aaa5ab835ab39a66d47b 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -11173,7 +11173,8 @@ int Client::ll_get_stripe_osd(Inode *in, uint64_t blockno,
                              file_layout_t* layout)
 {
   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 51376c0e51eee52829528426a014f7c37126a8ce..c7d8f2bfe50d050a491a7e1c5c03a65c816c93c5 100644 (file)
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -1061,11 +1061,6 @@ public:
   int get_caps_issued(int fd);
   int get_caps_issued(const char *path);
 
-  // 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);