From: Sage Weil <sage@newdream.net>
Date: Fri, 23 Apr 2010 21:38:31 +0000 (-0700)
Subject: osd: no error checking in data structure (caller should do it)
X-Git-Tag: v0.22~622^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cf8ce29d3c2e9e468fc2d9e70a8d49be48ece71c;p=ceph.git

osd: no error checking in data structure (caller should do it)
---

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 4a50d9269762..442c8582e180 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -653,26 +653,23 @@ struct pg_pool_t {
     snaps[s].name = n;
     snaps[s].stamp = stamp;
   }
-#define EINVAL 22
-  int add_unmanaged_snap(__u64& snapid) {
+  void add_unmanaged_snap(__u64& snapid) {
     if (removed_snaps.empty()) {
-      if (!snaps.empty()) return -EINVAL; //already has pool snaps
+      assert(snaps.empty());
       removed_snaps.insert(snapid_t(1));
       v.snap_seq = 1;
     }
     snapid = v.snap_seq = v.snap_seq + 1;
-    return 0;
   }
   void remove_snap(snapid_t s) {
     assert(snaps.count(s));
     snaps.erase(s);
     v.snap_seq = v.snap_seq + 1;
   }
-  int remove_unmanaged_snap(snapid_t s) {
-    if (!snaps.empty()) return -EINVAL; //has pool snaps, not unmanaged!
+  void remove_unmanaged_snap(snapid_t s) {
+    assert(snaps.empty());
     removed_snaps.insert(s);
     v.snap_seq = v.snap_seq + 1;
-    return 0;
   }
 
   SnapContext get_snap_context() const {