fixed warnings on LP64; removed MonitorStore debug message

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1198 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/trunk/ceph/messages/MOSDOp.h b/trunk/ceph/messages/MOSDOp.h
index 6139df56d833e39503e0c56a71af9975a6dd88f1..d16b02e8aad5174e45dc560e7f3ea071240d5faa 100644 (file)
--- a/trunk/ceph/messages/MOSDOp.h
+++ b/trunk/ceph/messages/MOSDOp.h
@@ -93,7 +93,9 @@ private:
     eversion_t pg_trim_to;   // primary->replica: trim to here
     
     int op;
-    size_t length, offset;
+    size_t length;
+    off_t offset;
+
     eversion_t version;
     eversion_t old_version;
     
@@ -136,7 +138,7 @@ private:
   void set_op(int o) { st.op = o; }
 
   const size_t get_length() { return st.length; }
-  const size_t get_offset() { return st.offset; }
+  const off_t get_offset() { return st.offset; }
 
   map<string,bufferptr>& get_attrset() { return attrset; }
   void set_attrset(map<string,bufferptr> &as) { attrset = as; }
@@ -183,7 +185,7 @@ private:
   //void set_rg_nrep(int n) { st.rg_nrep = n; }
 
   void set_length(size_t l) { st.length = l; }
-  void set_offset(size_t o) { st.offset = o; }
+  void set_offset(off_t o) { st.offset = o; }
   void set_version(eversion_t v) { st.version = v; }
   void set_old_version(eversion_t ov) { st.old_version = ov; }
   

diff --git a/trunk/ceph/mon/MonitorStore.cc b/trunk/ceph/mon/MonitorStore.cc
index 9808d4223bebe83ca6dcd18e494ae8f680fc39ba..8ac98631a0c54bb445e7e4812225ee6ce0dbca49 100644 (file)
--- a/trunk/ceph/mon/MonitorStore.cc
+++ b/trunk/ceph/mon/MonitorStore.cc
@@ -107,7 +107,6 @@ void MonitorStore::put_int(version_t val, const char *a, const char *b)
   sprintf(tfn, "%s.new", fn);
 
   int fd = ::open(tfn, O_WRONLY|O_CREAT);
-  dout(0) << " fd " << fd << " tfn " << tfn << " " << errno << " " << strerror(errno) << " " << get_current_dir_name() << endl;
   assert(fd > 0);
   ::fchmod(fd, 0644);
   ::write(fd, vs, strlen(vs));

diff --git a/trunk/ceph/osd/OSD.cc b/trunk/ceph/osd/OSD.cc
index 4404822fb5e14ed521cb11d4664cf08aab4fb244..0aa0e707fbd0c5b8fca9eadc4a33d4966eaa0f0b 100644 (file)
--- a/trunk/ceph/osd/OSD.cc
+++ b/trunk/ceph/osd/OSD.cc
@@ -3435,7 +3435,7 @@ void OSD::prepare_op_transaction(ObjectStore::Transaction& t,
       struct stat st;
       int r = store->stat(oid, &st);
       if (r >= 0) {
-       if (op->get_offset() + op->get_length() >= st.st_size) {
+       if (op->get_offset() + (off_t)op->get_length() >= (off_t)st.st_size) {
          if (op->get_offset()) 
            t.truncate(oid, op->get_length() + op->get_offset());
          else

diff --git a/trunk/ceph/osdc/Journaler.cc b/trunk/ceph/osdc/Journaler.cc
index c77c7e7d0abd4709d0a372146642f38a8abf31b0..dee6448b3494d91d44ec4c92c211df65d5f0a5d8 100644 (file)
--- a/trunk/ceph/osdc/Journaler.cc
+++ b/trunk/ceph/osdc/Journaler.cc
@@ -239,7 +239,7 @@ off_t Journaler::append_entry(bufferlist& bl, Context *onsync)
   if (!g_conf.journaler_allow_split_entries) {
     // will we span a stripe boundary?
     int p = inode.layout.stripe_size;
-    if (write_pos / p != (write_pos + bl.length() + sizeof(s)) / p) {
+    if (write_pos / p != (write_pos + (off_t)(bl.length() + sizeof(s))) / p) {
       // yes.
       // move write_pos forward.
       off_t owp = write_pos;
@@ -498,7 +498,7 @@ bool Journaler::is_readable()
   // start reading some more?
   if (!_is_reading()) {
     if (s)
-      fetch_len = MAX(fetch_len, sizeof(s)+s-read_buf.length()); 
+      fetch_len = MAX(fetch_len, (off_t)(sizeof(s)+s-read_buf.length())); 
     _issue_read(fetch_len);
   }