summaryrefslogtreecommitdiffstats
path: root/src/mds/journal.cc
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2009-03-16 18:57:23 +0100
committerSage Weil <sage@newdream.net>2009-03-16 18:57:23 +0100
commit1bcccc3be635abbb04e7ef108ba31dce7d0db90a (patch)
tree1107e15a7816ea07e99546db3d9e365faf01c140 /src/mds/journal.cc
parentinitscript: fix btrfs path default to osd data (diff)
parentkclient: fix uninitialized var warnings (diff)
downloadceph-1bcccc3be635abbb04e7ef108ba31dce7d0db90a.tar.xz
ceph-1bcccc3be635abbb04e7ef108ba31dce7d0db90a.zip
Merge commit '1e8073b75ad5172a1ef975e7c6c42406888f56ae'v0.7.1
Conflicts: src/init-ceph src/mkcephfs
Diffstat (limited to 'src/mds/journal.cc')
-rw-r--r--src/mds/journal.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index 8cde8cb94c0..c2f4844e9ec 100644
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -360,7 +360,8 @@ void EMetaBlob::replay(MDS *mds, LogSegment *logseg)
if (lump.is_dirty()) {
dir->_mark_dirty(logseg);
- dir->get_inode()->filelock.set_updated();
+ dir->get_inode()->filelock.mark_dirty();
+ dir->get_inode()->nestlock.mark_dirty();
}
if (lump.is_new())
dir->mark_new(logseg);