diff options
| author | Sage Weil <sage@inktank.com> | 2013-05-29 10:26:56 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-05-29 10:26:56 -0700 |
| commit | 532dee523ab250dc08cb96578ef8bcc6bba55584 (patch) | |
| tree | 8a0a1320d8d9b71bac35c7dea678ea175b49430d /src/mds/CDir.h | |
| parent | 1d0aa2add3fd768d767ae3b0d4d62922904aae94 (diff) | |
| parent | 7e0e0963ed027387f3d575c532dd85ae029ed063 (diff) | |
| download | ceph-532dee523ab250dc08cb96578ef8bcc6bba55584.tar.gz | |
Merge remote-tracking branch 'yan/wip-mds'
Reviewed-by: Sage Weil <sage@inktank.com>
Conflicts:
src/mds/MDCache.cc
Diffstat (limited to 'src/mds/CDir.h')
| -rw-r--r-- | src/mds/CDir.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mds/CDir.h b/src/mds/CDir.h index 7e1db73af06..87c79c2af1b 100644 --- a/src/mds/CDir.h +++ b/src/mds/CDir.h @@ -494,7 +494,7 @@ private: unsigned max_write_size=-1, map_t::iterator last_committed_dn=map_t::iterator()); void _encode_dentry(CDentry *dn, bufferlist& bl, const set<snapid_t> *snaps); - void _committed(version_t v, version_t last_renamed_version); + void _committed(version_t v); void wait_for_commit(Context *c, version_t v=0); // -- dirtyness -- |