From: Sage Weil Date: Sat, 16 Aug 2014 19:43:24 +0000 (-0700) Subject: os/FileStore: rename start_sync() -> do_force_sync() X-Git-Tag: v0.86~233^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=29e93f7c53865d5b8da09728fa17ef21862258a5;p=ceph.git os/FileStore: rename start_sync() -> do_force_sync() Just to avoid confusion with start_sync(Context*c), which is totally different. Signed-off-by: Sage Weil --- diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index 06eca20284f..7b41b1cc8b2 100644 --- a/src/os/FileStore.cc +++ b/src/os/FileStore.cc @@ -1582,8 +1582,7 @@ int FileStore::umount() { dout(5) << "umount " << basedir << dendl; - - start_sync(); + do_force_sync(); lock.Lock(); stop = true; @@ -3454,8 +3453,9 @@ void FileStore::_start_sync() } } -void FileStore::start_sync() +void FileStore::do_force_sync() { + dout(10) << __func__ << dendl; Mutex::Locker l(lock); force_sync = true; sync_cond.Signal(); diff --git a/src/os/FileStore.h b/src/os/FileStore.h index fcb4796d3b9..87a5626451e 100644 --- a/src/os/FileStore.h +++ b/src/os/FileStore.h @@ -543,7 +543,7 @@ public: void _start_sync(); - void start_sync(); + void do_force_sync(); void start_sync(Context *onsafe); void sync(); void _flush_op_queue();