From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 21 Jul 2017 20:22:36 +0000 (-0700)
Subject: Merge PR 15942 into master
X-Git-Tag: v12.1.2~179
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=db6b76b0e4186b47a337d18d3d21fef4b1159489;p=ceph.git

Merge PR 15942 into master

* refs/remotes/upstream/pull/15942/head:
	client: add unlock_fh_pos when abort

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

db6b76b0e4186b47a337d18d3d21fef4b1159489