RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 00:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #19837 into master

Browse Source 
* refs/pull/19837/head:
	client: avoid recursive lock in ll_get_vino

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: huanwen ren <ren.huanwen@zte.com.cn>
This commit is contained in:
Patrick Donnelly 2018-01-16 20:06:31 -08:00
commit cc710979e3
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/Client.cc
View File

@ -12714,7 +12714,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;
@ -12823,7 +12823,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 "