From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 14 May 2018 20:28:49 +0000 (-0700)
Subject: Merge PR #21966 into master
X-Git-Tag: v14.0.0~133
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8937f5f41a2a05bc3ffd8f719409cd4053287efe;p=ceph.git

Merge PR #21966 into master

* refs/pull/21966/head:
	mds: handle imported session race
	mds: check for session import race

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
---

8937f5f41a2a05bc3ffd8f719409cd4053287efe