From 4c211d0d6ce76e592eb9b70445fde6f572fdb4f2 Mon Sep 17 00:00:00 2001 From: dongdong tao Date: Mon, 8 Jan 2018 16:00:31 +0800 Subject: [PATCH] client: avoid recursive lock in ll_get_vino Fixes: http://tracker.ceph.com/issues/22629 Signed-off-by: dongdong tao (cherry picked from commit fdfbe40c3f16c14dc9c3352f3eea66d34138ee9d) --- src/client/Client.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 1d9277a61b6e..c9cec23c9098 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -12604,7 +12604,7 @@ int Client::ll_read_block(Inode *in, uint64_t blockid, if (unmounting) return -ENOTCONN; - vinodeno_t vino = ll_get_vino(in); + vinodeno_t vino = _get_vino(in); object_t oid = file_object_t(vino.ino, blockid); C_SaferCond onfinish; bufferlist bl; @@ -12713,7 +12713,7 @@ int Client::ll_commit_blocks(Inode *in, Mutex::Locker lock(client_lock); /* BarrierContext *bctx; - vinodeno_t vino = ll_get_vino(in); + vinodeno_t vino = _get_vino(in); uint64_t ino = vino.ino; ldout(cct, 1) << "ll_commit_blocks for " << vino.ino << " from " -- 2.47.3