From c0a1e11c9aa58c014858d146b6e8ea44374d5b73 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 3 Jun 2009 14:43:18 -0700 Subject: [PATCH] raods: minor and merge fixes --- src/include/rados.h | 3 --- src/os/FileStore.cc | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/include/rados.h b/src/include/rados.h index 875fbbd1bf403..f82b8d0ec846c 100644 --- 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 4b7ef2c9d061c..c68182619421e 100644 --- a/src/os/FileStore.cc +++ b/src/os/FileStore.cc @@ -1889,7 +1889,7 @@ int FileStore::collection_list_partial(coll_t c, vector& 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 -- 2.39.5