From 12133bd16b812cbf186f6f25df9982ac98ae017a Mon Sep 17 00:00:00 2001 From: sage Date: Mon, 30 Jan 2006 23:35:17 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@581 29311d96-e01e-0410-9327-a35deaab8ce9 --- ceph/mds/MDS.cc | 6 +++--- ceph/mds/MDStore.cc | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ceph/mds/MDS.cc b/ceph/mds/MDS.cc index 50f4be2ad984c..8d556ecf63d94 100644 --- a/ceph/mds/MDS.cc +++ b/ceph/mds/MDS.cc @@ -2598,16 +2598,16 @@ void MDS::handle_client_symlink(MClientRequest *req, CInode *diri) void MDS::handle_client_truncate(MClientRequest *req, CInode *cur) { // write - if (!mdcache->inode_hard_write_start(cur, req)) + if (!mdcache->inode_file_write_start(cur, req)) return; // fw or (wait for) lock - // check permissions + // check permissions // do update cur->inode.size = req->get_sizearg(); cur->mark_dirty(); - mdcache->inode_hard_write_finish(cur); + mdcache->inode_file_write_finish(cur); balancer->hit_inode(cur); diff --git a/ceph/mds/MDStore.cc b/ceph/mds/MDStore.cc index b250fbb0d999b..cc913bbeee2c0 100644 --- a/ceph/mds/MDStore.cc +++ b/ceph/mds/MDStore.cc @@ -648,7 +648,8 @@ void MDStore::commit_dir_slice( CDir *dir, fin->bl.length(), 0, fin->bl, 0, //OSD_OP_FLAGS_TRUNCATE, // truncate file/object after end of this write - NULL, fin ); // on safe + //NULL, fin ); // on safe + fin, NULL ); // on sync... until we pay attention to BOTH } -- 2.39.5