From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 22 Jun 2018 23:21:49 +0000 (-0700)
Subject: Merge PR #22486 into master
X-Git-Tag: v14.0.1~1039
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=03a8fe824badaaa53d65a71f9852c442f0853667;p=ceph.git

Merge PR #22486 into master

* refs/pull/22486/head:
	mds: avoid traversing all dirfrags when trying to get wrlocks

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

03a8fe824badaaa53d65a71f9852c442f0853667
diff --cc src/mds/Migrator.cc
index 55b1ff9418a1,76e84ba47fcf..fa4852df2be4
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@@ -860,10 -860,10 +860,10 @@@ void Migrator::export_dir(CDir *dir, md
      }
    }
  
 -  mds->hit_export_target(ceph_clock_now(), dest, -1);
 +  mds->hit_export_target(dest, -1);
  
    dir->auth_pin(this);
-   dir->state_set(CDir::STATE_EXPORTING);
+   dir->mark_exporting();
  
    MDRequestRef mdr = mds->mdcache->request_start_internal(CEPH_MDS_OP_EXPORTDIR);
    mdr->more()->export_dir = dir;