]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #22486 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 22 Jun 2018 23:21:49 +0000 (16:21 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 22 Jun 2018 23:21:49 +0000 (16:21 -0700)
* refs/pull/22486/head:
mds: avoid traversing all dirfrags when trying to get wrlocks

Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/mds/CDir.cc
src/mds/CDir.h
src/mds/CInode.cc
src/mds/CInode.h
src/mds/MDCache.cc
src/mds/Migrator.cc

diff --cc src/mds/CDir.cc
Simple merge
diff --cc src/mds/CDir.h
Simple merge
Simple merge
Simple merge
Simple merge
index 55b1ff9418a10ced41ea30a5d75e80d3906e4529,76e84ba47fcf1a6382583685b97b5d11858010f9..fa4852df2be43aee99d5591cb1679bf4c3d7b415
@@@ -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;