ceph-compile-fixes.patch

   1 diff -up ceph-0.41/src/cephfs.cc.compilefix ceph-0.41/src/cephfs.cc
   2 --- ceph-0.41/src/cephfs.cc.compilefix  2012-02-16 21:08:19.983652818 -0500
   3 +++ ceph-0.41/src/cephfs.cc     2012-02-16 21:08:31.917550083 -0500
   4 @@ -24,6 +24,7 @@
   5  #include <sys/stat.h>
   6  #include <fcntl.h>
   7  #include <stdlib.h>
   8 +#include <unistd.h>
   9  #include "client/ioctl.h"
  10
  11  using namespace std;
  12 diff -up ceph-0.41/src/common/safe_io.h.compilefix ceph-0.41/src/common/safe_io.h
  13 --- ceph-0.41/src/common/safe_io.h.compilefix   2012-02-16 12:53:31.456514774 -0500
  14 +++ ceph-0.41/src/common/safe_io.h      2012-02-16 12:54:00.045233017 -0500
  15 @@ -16,6 +16,7 @@
  16  #define CEPH_SAFE_IO
  17
  18  #include "common/compiler_extensions.h"
  19 +#include <sys/types.h>
  20
  21  #ifdef __cplusplus
  22  extern "C" {
  23 diff -up ceph-0.41/src/osd/PG.cc.compilefix ceph-0.41/src/osd/PG.cc
  24 --- ceph-0.41/src/osd/PG.cc.compilefix  2012-02-16 20:58:21.039559849 -0500
  25 +++ ceph-0.41/src/osd/PG.cc     2012-02-16 20:59:07.920149937 -0500
  26 @@ -4830,13 +4830,13 @@ bool PG::PriorSet::affected_by_map(const
  27      }
  28
  29      // did a down osd in cur get (re)marked as lost?
  30 -    map<int,epoch_t>::const_iterator p = blocked_by.find(o);
  31 -    if (p != blocked_by.end()) {
  32 +    map<int,epoch_t>::const_iterator r = blocked_by.find(o);
  33 +    if (r != blocked_by.end()) {
  34        if (!osdmap->exists(o)) {
  35         dout(10) << "affected_by_map osd." << o << " no longer exists" << dendl;
  36         return true;
  37        }
  38 -      if (osdmap->get_info(o).lost_at != p->second) {
  39 +      if (osdmap->get_info(o).lost_at != r->second) {
  40         dout(10) << "affected_by_map osd." << o << " (re)marked as lost" << dendl;
  41         return true;
  42        }
  43 diff -up ceph-0.41/src/osd/ReplicatedPG.cc.compilefix ceph-0.41/src/osd/ReplicatedPG.cc
  44 --- ceph-0.41/src/osd/ReplicatedPG.cc.compilefix        2012-02-16 21:03:26.140892128 -0500
  45 +++ ceph-0.41/src/osd/ReplicatedPG.cc   2012-02-16 21:04:45.190200945 -0500
  46 @@ -5436,8 +5436,8 @@ int ReplicatedPG::recover_replicas(int m
  47        }
  48
  49        dout(10) << __func__ << ": recover_object_replicas(" << soid << ")" << dendl;
  50 -      map<hobject_t,Missing::item>::const_iterator p = m.missing.find(soid);
  51 -      started += recover_object_replicas(soid, p->second.need);
  52 +      map<hobject_t,Missing::item>::const_iterator r = m.missing.find(soid);
  53 +      started += recover_object_replicas(soid, r->second.need);
  54      }
  55    }
  56
  57 diff -up ceph-0.41/src/test/system/systest_runnable.cc.compilefix ceph-0.41/src/test/system/systest_runnable.cc
  58 --- ceph-0.41/src/test/system/systest_runnable.cc.compilefix    2012-02-16 12:54:35.430884275 -0500
  59 +++ ceph-0.41/src/test/system/systest_runnable.cc       2012-02-16 12:54:45.923780862 -0500
  60 @@ -28,6 +28,7 @@
  61  #include <sys/syscall.h>
  62  #include <sys/types.h>
  63  #include <sys/wait.h>
  64 +#include <unistd.h>
  65  #include <vector>
  66
  67  #if defined(__FreeBSD__)