From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 7 Jul 2017 04:49:08 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/pull/15758/head' into master
X-Git-Tag: v12.1.1~147
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c1590d7a1fde1035e8cb190293b285f3654c31c4;p=ceph.git

Merge remote-tracking branch 'upstream/pull/15758/head' into master

* upstream/pull/15758/head:
  mds: repeat dir->is_frozen in rdlock_path_xlock_dentry

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

c1590d7a1fde1035e8cb190293b285f3654c31c4