]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
client: avoid recursive lock in ll_get_vino 19837/head
authordongdong tao <tdd21151186@gmail.com>
Mon, 8 Jan 2018 08:00:31 +0000 (16:00 +0800)
committerdongdong tao <tdd21151186@gmail.com>
Tue, 9 Jan 2018 07:48:45 +0000 (15:48 +0800)
Fixes: http://tracker.ceph.com/issues/22629
Signed-off-by: dongdong tao <tdd21151186@gmail.com>
src/client/Client.cc

index 1c2d66002eab9cae54558fdf7aaff549c9239576..8f29cc99b47b95d30bd5b18b8bdda50711747116 100644 (file)
@@ -12717,7 +12717,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;
@@ -12826,7 +12826,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 "