From 8bf725f74a2359d2ce8fcacc5cb3f03d94491ea9 Mon Sep 17 00:00:00 2001
From: sage <sage@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Wed, 1 Feb 2006 04:06:34 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@584 29311d96-e01e-0410-9327-a35deaab8ce9
---
 ceph/TODO             | 4 ----
 ceph/common/Clock.h   | 4 ++--
 ceph/crush/Bucket.h   | 2 ++
 ceph/crush/crush.h    | 3 ++-
 ceph/include/buffer.h | 1 +
 ceph/mds/CDentry.cc   | 1 +
 ceph/mds/Lock.h       | 1 +
 ceph/mds/MDCache.cc   | 2 ++
 ceph/osd/Fake.h       | 1 +
 9 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ceph/TODO b/ceph/TODO
index ce6ae715745..e727018ded8 100644
--- a/ceph/TODO
+++ b/ceph/TODO
@@ -5,10 +5,6 @@ client
 - client will re-tx anything it needed to say upon rx of new mds notification (?)
 
 
-bdev
-- multiple io_threads.. need block-range locks
-  - threads may need to sleep.. need to be woken up, etc..
-
 ebofs
 - combine inodes into same blocks
 - zero regions?
diff --git a/ceph/common/Clock.h b/ceph/common/Clock.h
index 12e2dac48e4..74d705a74a1 100644
--- a/ceph/common/Clock.h
+++ b/ceph/common/Clock.h
@@ -26,12 +26,12 @@ class utime_t {
   
   // accessors
   time_t        sec()  const { return tv.tv_sec; } 
-  __suseconds_t usec() const { return tv.tv_usec; }
+  long          usec() const { return tv.tv_usec; }
   int           nsec() const { return tv.tv_usec*1000; }
 
   // ref accessors/modifiers
   time_t&         sec_ref()  { return tv.tv_sec; } 
-  __suseconds_t&  usec_ref() { return tv.tv_usec; }
+  long&           usec_ref() { return tv.tv_usec; }
 
   struct timeval& timeval()  { return tv; }
 
diff --git a/ceph/crush/Bucket.h b/ceph/crush/Bucket.h
index b621b164493..08e1503dc77 100644
--- a/ceph/crush/Bucket.h
+++ b/ceph/crush/Bucket.h
@@ -304,6 +304,7 @@ namespace crush {
 		p++; pw++; ps++;  // next!
 	  }
 	  assert(0);
+	  return 0;
 	}	
 
 
@@ -599,6 +600,7 @@ namespace crush {
 	default:
 	  assert(0);
 	}
+	return 0;
   }
 
 
diff --git a/ceph/crush/crush.h b/ceph/crush/crush.h
index 3f8a4659a90..c2ec6661076 100644
--- a/ceph/crush/crush.h
+++ b/ceph/crush/crush.h
@@ -199,6 +199,7 @@ namespace crush {
 		}
 		out << "]";
 	  }
+	  return 0;
 	}
 
 
@@ -210,7 +211,7 @@ namespace crush {
 	  return n;
 	}
 
-	int add_item(int parent, int item, float w, bool back=false) {
+	void add_item(int parent, int item, float w, bool back=false) {
 	  // add item
 	  assert(!buckets[parent]->is_uniform());
 	  Bucket *p = buckets[parent];
diff --git a/ceph/include/buffer.h b/ceph/include/buffer.h
index 1178498ef47..bf49846a395 100644
--- a/ceph/include/buffer.h
+++ b/ceph/include/buffer.h
@@ -149,6 +149,7 @@ class buffer {
   // operators
   buffer& operator=(buffer& other) {
 	assert(0);  // not implemented, no reasonable assignment semantics.
+	return *this;
   }
 
   char *c_str() {
diff --git a/ceph/mds/CDentry.cc b/ceph/mds/CDentry.cc
index 3ced6011ce5..666db5ef87d 100644
--- a/ceph/mds/CDentry.cc
+++ b/ceph/mds/CDentry.cc
@@ -89,6 +89,7 @@ void CDentry::unlink_remote()
 // =
 const CDentry& CDentry::operator= (const CDentry& right) {
   assert(0); //std::cerr << "copy op called, implement me" << endl;
+  return *this;
 }
 
   // comparisons
diff --git a/ceph/mds/Lock.h b/ceph/mds/Lock.h
index 62954022c7b..e5dd44f1076 100644
--- a/ceph/mds/Lock.h
+++ b/ceph/mds/Lock.h
@@ -105,6 +105,7 @@ class CLock {
 	default: 
 	  assert(0);
 	}
+	return 0;
   }
 
   // gather set
diff --git a/ceph/mds/MDCache.cc b/ceph/mds/MDCache.cc
index dad2fea748f..77afa714541 100644
--- a/ceph/mds/MDCache.cc
+++ b/ceph/mds/MDCache.cc
@@ -4583,6 +4583,8 @@ bool MDCache::inode_file_sync(CInode *in)
   }
   else 
 	assert(0); // wtf.
+
+  return false;
 }
 
 
diff --git a/ceph/osd/Fake.h b/ceph/osd/Fake.h
index d2057d7dd7e..d10ecba5c7d 100644
--- a/ceph/osd/Fake.h
+++ b/ceph/osd/Fake.h
@@ -115,6 +115,7 @@ class FakeStoreAttrs {
 	
 	int listattr(char *attrs, size_t size) {
 	  assert(0);
+	  return 0;
 	}
 	
 	bool empty() { return attrs.empty(); }