]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'upstream/pull/15758/head' into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 04:49:08 +0000 (21:49 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 04:49:08 +0000 (21:49 -0700)
commitc1590d7a1fde1035e8cb190293b285f3654c31c4
tree613ddc9f9798c3674f87809a22f00dc544c1cf66
parentbbb0c6e3e1cbc6baa974a465cbc2cb5fd463c5aa
parenta5f1684819d9e094d503de081400ab720808dd7a
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>
src/mds/Server.cc