From: Greg Farnum <greg@inktank.com>
Date: Mon, 1 Jul 2013 21:57:39 +0000 (-0700)
Subject: key_value_store: fixup errno handling
X-Git-Tag: v0.67-rc1~128^2~18^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6c836657dbf2a439e39c755682ea8abe52298e4;p=ceph.git

key_value_store: fixup errno handling

Don't use "errno" as a variable name, and include <errno.h>
instead of some of the specific paths.

Signed-off-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/key_value_store/cls_kvs.cc b/src/key_value_store/cls_kvs.cc
index ab3095fe7636..7aa26852db9f 100644
--- a/src/key_value_store/cls_kvs.cc
+++ b/src/key_value_store/cls_kvs.cc
@@ -6,8 +6,7 @@
  */
 
 #include "objclass/objclass.h"
-#include "/usr/include/asm-generic/errno-base.h"
-#include "/usr/include/asm-generic/errno.h"
+#include <errno.h>
 #include "key_value_store/kvs_arg_types.h"
 #include "include/types.h"
 #include <iostream>
diff --git a/src/key_value_store/kv_flat_btree_async.cc b/src/key_value_store/kv_flat_btree_async.cc
index 7b0ed2bc4c47..1ce272951408 100644
--- a/src/key_value_store/kv_flat_btree_async.cc
+++ b/src/key_value_store/kv_flat_btree_async.cc
@@ -990,7 +990,7 @@ int KvFlatBtreeAsync::perform_ops(const string &debug_prefix,
   return err;
 }
 
-int KvFlatBtreeAsync::cleanup(const index_data &idata, const int &errno) {
+int KvFlatBtreeAsync::cleanup(const index_data &idata, const int &error) {
   if (verbose) cout << "\t\t" << client_name << ": cleaning up after "
       << idata.str()
       << std::endl;
@@ -998,7 +998,7 @@ int KvFlatBtreeAsync::cleanup(const index_data &idata, const int &errno) {
   assert(idata.prefix != "");
   map<std::string,bufferlist> new_index;
   map<std::string, pair<bufferlist, int> > assertions;
-  switch (errno) {
+  switch (error) {
   case -EFIRSTOBJ: {
     //this happens if the split or rebalance failed to mark the first object,
     //meaning only the index needs to be changed.
diff --git a/src/key_value_store/kv_flat_btree_async.h b/src/key_value_store/kv_flat_btree_async.h
index 132d7987492c..ea13fad6553a 100644
--- a/src/key_value_store/kv_flat_btree_async.h
+++ b/src/key_value_store/kv_flat_btree_async.h
@@ -693,7 +693,7 @@ protected:
    * died (should be -ENOENT or -ETIMEDOUT)
    * @post: rolls forward if -ENOENT, otherwise rolls back.
    */
-  int cleanup(const index_data &idata, const int &errno);
+  int cleanup(const index_data &idata, const int &error);
 
   /**
    * does the ObjectWriteOperation and splits, reads the index, and/or retries