From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sun, 29 Apr 2018 18:05:33 +0000 (-0700)
Subject: Merge PR #21554 into master
X-Git-Tag: v13.1.0~49
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=543d8a0e4cfefd2c4e8e22f151555bb77617aa21;p=ceph.git

Merge PR #21554 into master

* refs/pull/21554/head:
	client: avoid second lock on client_lock

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
---

543d8a0e4cfefd2c4e8e22f151555bb77617aa21