From 79e21a29774ef4630443b58d866cea59906df7a4 Mon Sep 17 00:00:00 2001 From: sage Date: Mon, 2 Jan 2006 08:30:51 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@564 29311d96-e01e-0410-9327-a35deaab8ce9 --- ceph/client/SyntheticClient.cc | 2 +- ceph/osd/OSD.cc | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ceph/client/SyntheticClient.cc b/ceph/client/SyntheticClient.cc index 909d9d1e6f484..b2072d38a04a0 100644 --- a/ceph/client/SyntheticClient.cc +++ b/ceph/client/SyntheticClient.cc @@ -712,7 +712,7 @@ int SyntheticClient::read_file(string& fn, int size, int rdsize) // size is in // verify fingerprint int *p = (int*)buf; - while ((char*)p < buf + rdsize) { + while ((char*)p + 32 < buf + rdsize) { assert(*p == (char*)p - buf); p++; assert(*p == (int)i); diff --git a/ceph/osd/OSD.cc b/ceph/osd/OSD.cc index f151d6fc35faf..fbf7946d39627 100644 --- a/ceph/osd/OSD.cc +++ b/ceph/osd/OSD.cc @@ -179,6 +179,9 @@ int OSD::shutdown() { dout(1) << "shutdown" << endl; + // finish ops + wait_for_no_ops(); + // stop threads delete threadpool; threadpool = 0; -- 2.39.5