From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 11 May 2018 21:57:54 +0000 (-0700)
Subject: Merge PR #21615 into master
X-Git-Tag: v14.0.0~146
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b87103157e77d7ae3b3530b366a5d69455e3fe96;p=ceph.git

Merge PR #21615 into master

* refs/pull/21615/head:
	ceph-fuse: Delete inode's bufferhead was in Tx state would lead a assert fail

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

b87103157e77d7ae3b3530b366a5d69455e3fe96