]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: use CDIR_AUTH_UNDEF where possible
authorSage Weil <sage.weil@dreamhost.com>
Wed, 8 Jun 2011 20:27:34 +0000 (13:27 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Wed, 8 Jun 2011 20:27:41 +0000 (13:27 -0700)
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
src/mds/journal.cc

index 1f69a07f14faa9d9029528b70f4afef6863b3c7b..951caa87d53f2e83eedf4e92d6b3fa3787bf2bee 100644 (file)
@@ -677,7 +677,7 @@ void EMetaBlob::replay(MDS *mds, LogSegment *logseg)
       }
       dir = renamed_diri->get_or_open_dirfrag(mds->mdcache, *p);
       dout(10) << " creating new rename import bound " << *dir << dendl;
-      mds->mdcache->adjust_subtree_auth(dir, pair<int,int>(CDIR_AUTH_UNKNOWN, CDIR_AUTH_UNKNOWN), false);
+      mds->mdcache->adjust_subtree_auth(dir, CDIR_AUTH_UNDEF, false);
     }
   }
 
@@ -1222,7 +1222,7 @@ void EExport::replay(MDS *mds)
   }
 
   // adjust auth away
-  mds->mdcache->adjust_bounded_subtree_auth(dir, realbounds, pair<int,int>(CDIR_AUTH_UNKNOWN, CDIR_AUTH_UNKNOWN));
+  mds->mdcache->adjust_bounded_subtree_auth(dir, realbounds, CDIR_AUTH_UNDEF);
 
   mds->mdcache->try_trim_non_auth_subtree(dir);
 }
@@ -1280,7 +1280,7 @@ void EImportFinish::replay(MDS *mds)
       CDir *dir = mds->mdcache->get_dirfrag(base);
       vector<dirfrag_t> bounds;
       mds->mdcache->get_ambiguous_import_bounds(base, bounds);
-      mds->mdcache->adjust_bounded_subtree_auth(dir, bounds, pair<int,int>(CDIR_AUTH_UNKNOWN, CDIR_AUTH_UNKNOWN));
+      mds->mdcache->adjust_bounded_subtree_auth(dir, bounds, CDIR_AUTH_UNDEF);
       mds->mdcache->cancel_ambiguous_import(dir);
       mds->mdcache->try_trim_non_auth_subtree(dir);
    }