]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #19837 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 17 Jan 2018 04:06:31 +0000 (20:06 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 17 Jan 2018 04:06:31 +0000 (20:06 -0800)
* 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>
1  2 
src/client/Client.cc

Simple merge