raods: minor and merge fixes

diff --git a/src/include/rados.h b/src/include/rados.h
index 875fbbd1bf4036f73b9a3aee32e29ad894b57387..f82b8d0ec846c74a16f02f7fa90253c26057bff2 100644 (file)
--- a/src/include/rados.h
+++ b/src/include/rados.h
@@ -184,9 +184,6 @@ enum {
        /* fancy read */
        CEPH_OSD_OP_MASKTRUNC = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 4,
 
-       /* list pg */
-       CEPH_OSD_OP_PGLS      = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_NOOBJ | 1,
-
        /* write */
        CEPH_OSD_OP_WRITE     = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 1,
        CEPH_OSD_OP_WRITEFULL = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 2,

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 4b7ef2c9d061ca35b79891ea066e3dff5ff8c771..c68182619421e40f492868606da4b9e4536d39fd 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -1889,7 +1889,7 @@ int FileStore::collection_list_partial(coll_t c, vector<pobject_t>& ls, int max_
   get_cdir(c, fn);
   dout(10) << "collection_list " << fn << dendl;
 
-  DIR *dir;
+  DIR *dir = NULL;
   struct dirent *de;
   
   // first, build (ino, object) list