From db943c05e6eddc9c29ad2d7c7a4b3c5b684afe79 Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Wed, 3 Jun 2009 16:59:40 -0700
Subject: [PATCH] rados: pgls small cleanup

---
 src/librados.cc     | 6 ------
 src/os/FileStore.cc | 7 +------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/librados.cc b/src/librados.cc
index 60bd52f950f34..27e9b9b6a1973 100644
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -327,8 +327,6 @@ int RadosClient::list(int pool, int max_entries, vector<ceph_object>& entries, R
 
   memset(&oid, 0, sizeof(oid));
 
-  dout(0) << hex << "pool=" << dec << pool << " op.cookie=" << op.cookie << dendl;
-
   ceph_object_layout layout;
 retry:
   int pg_num = objecter->osdmap->get_pg_num(pool);
@@ -357,8 +355,6 @@ retry:
         cond.Wait(lock);
 
       lock.Unlock();
-      dout(0) << "after pg_ls(" << op.seed << ") r=" << r << " got " << bl.length() << " bytes ol_pgls=" << hex << layout.ol_pgid << dec << dendl;
-      dout(0) << "max_entries=" << max_entries << dendl;
 
       bufferlist::iterator iter = bl.begin();
       PGLSResponse response;
@@ -369,12 +365,10 @@ retry:
         vector<pobject_t>::iterator ls_iter;
 
         for (ls_iter = response.entries.begin(); ls_iter != response.entries.end(); ++ls_iter) {
-          dout(0) << "entry: " << *ls_iter << dendl;
           ceph_object obj = (ceph_object)ls_iter->oid;
           entries.push_back(obj);
         }
         max_entries -= response_size;
-        dout(0) << "op.cookie=" << op.cookie << dendl;
 
         if (!max_entries)
           return r;
diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 06f8487dc1f8b..900cda928671c 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -1887,7 +1887,6 @@ int FileStore::collection_list_partial(coll_t c, vector<pobject_t>& ls, int max_
 
   char fn[PATH_MAX];
   get_cdir(c, fn);
-  dout(10) << "collection_list " << fn << dendl;
 
   DIR *dir = NULL;
   struct dirent *de;
@@ -1904,7 +1903,6 @@ int FileStore::collection_list_partial(coll_t c, vector<pobject_t>& ls, int max_
   }
 
   if (handle) {
-    dout(0) << "seeking to position " << *(off_t *)handle << dendl;
     seekdir(dir, *(off_t *)handle);
   }
 
@@ -1925,7 +1923,6 @@ int FileStore::collection_list_partial(coll_t c, vector<pobject_t>& ls, int max_
     }
     //cout << "  got object " << de->d_name << std::endl;
 
-    dout(0) << "readdir: " << de->d_name << dendl;
     pobject_t o;
     if (parse_object(de->d_name, o)) {
       inolist.push_back(pair<ino_t,pobject_t>(de->d_ino, o));
@@ -1933,10 +1930,8 @@ int FileStore::collection_list_partial(coll_t c, vector<pobject_t>& ls, int max_
     }
   }
 
-  if (handle) {
+  if (handle)
     *handle = (collection_list_handle_t)telldir(dir);
-    dout(0) << "returning handle=" << (__u64)*handle << dendl;
-  }
 
   ::closedir(dir);
 
-- 
2.39.5