diff options
| author | Yan, Zheng <zheng.z.yan@intel.com> | 2013-01-16 20:25:30 +0800 |
|---|---|---|
| committer | Yan, Zheng <zheng.z.yan@intel.com> | 2013-01-29 10:17:36 +0800 |
| commit | 0cf5e4e55ddf32d5087b39ab06961b22db5d6b5a (patch) | |
| tree | 3bc3a1afb1f14b9a8d188f175d87495cca93dc3e | |
| parent | c93cf2d23b2b6aef73d0ca59294eeed1eebfa646 (diff) | |
| download | ceph-0cf5e4e55ddf32d5087b39ab06961b22db5d6b5a.tar.gz | |
mds: journal inode's projected parent when doing link rollback
Otherwise the journal entry will revert the effect of any on-going
rename operation for the inode.
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
| -rw-r--r-- | src/mds/Server.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mds/Server.cc b/src/mds/Server.cc index f72a2869034..2b5c9e53bad 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -4395,7 +4395,7 @@ void Server::do_link_rollback(bufferlist &rbl, int master, MDRequest *mdr) mut->add_projected_inode(in); // parent dir rctime - CDir *parent = in->get_parent_dn()->get_dir(); + CDir *parent = in->get_projected_parent_dn()->get_dir(); fnode_t *pf = parent->project_fnode(); mut->add_projected_fnode(parent); pf->version = parent->pre_dirty(); @@ -4420,7 +4420,7 @@ void Server::do_link_rollback(bufferlist &rbl, int master, MDRequest *mdr) mdlog->start_entry(le); le->commit.add_dir_context(parent); le->commit.add_dir(parent, true); - le->commit.add_primary_dentry(in->get_parent_dn(), true, 0); + le->commit.add_primary_dentry(in->get_projected_parent_dn(), true, 0); mdlog->submit_entry(le, new C_MDS_LoggedLinkRollback(this, mut, mdr)); mdlog->flush(); |