Project

General

Profile

Download (2.7 KB)

Bug #2076 » ceph-0.41-compile-fixes.patch

David Nalley, 02/17/2012 08:13 AM

View differences:

ceph-0.41/src/cephfs.cc 2012-02-16 21:08:31.917550083 -0500
#include <sys/stat.h>
#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
#include "client/ioctl.h"
using namespace std;
ceph-0.41/src/common/safe_io.h 2012-02-16 12:54:00.045233017 -0500
#define CEPH_SAFE_IO
#include "common/compiler_extensions.h"
#include <sys/types.h>
#ifdef __cplusplus
extern "C" {
ceph-0.41/src/osd/PG.cc 2012-02-16 20:59:07.920149937 -0500
}
// did a down osd in cur get (re)marked as lost?
map<int,epoch_t>::const_iterator p = blocked_by.find(o);
if (p != blocked_by.end()) {
map<int,epoch_t>::const_iterator r = blocked_by.find(o);
if (r != blocked_by.end()) {
if (!osdmap->exists(o)) {
dout(10) << "affected_by_map osd." << o << " no longer exists" << dendl;
return true;
}
if (osdmap->get_info(o).lost_at != p->second) {
if (osdmap->get_info(o).lost_at != r->second) {
dout(10) << "affected_by_map osd." << o << " (re)marked as lost" << dendl;
return true;
}
ceph-0.41/src/osd/ReplicatedPG.cc 2012-02-16 21:04:45.190200945 -0500
}
dout(10) << __func__ << ": recover_object_replicas(" << soid << ")" << dendl;
map<hobject_t,Missing::item>::const_iterator p = m.missing.find(soid);
started += recover_object_replicas(soid, p->second.need);
map<hobject_t,Missing::item>::const_iterator r = m.missing.find(soid);
started += recover_object_replicas(soid, r->second.need);
}
}
ceph-0.41/src/test/system/systest_runnable.cc 2012-02-16 12:54:45.923780862 -0500
#include <sys/syscall.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
#include <vector>
#if defined(__FreeBSD__)
(2-2/2)