]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
filestore: fix 'omap' collection skipping
authorSage Weil <sage@inktank.com>
Sun, 17 Jun 2012 20:20:59 +0000 (13:20 -0700)
committerSage Weil <sage@inktank.com>
Sun, 17 Jun 2012 20:20:59 +0000 (13:20 -0700)
The if/else if/... structure was skipping this test if the file system
didn't support d_type.

Fixes: #2598
Signed-off-by: Sage Weil <sage@inktank.com>
src/os/FileStore.cc

index db4b1a43c4294b024de13ceb05b5b80bd4e3a8d5..0a9aca2ea3f90c254f5c2a4eda7e6ab354f6aded 100644 (file)
@@ -4410,7 +4410,8 @@ int FileStore::list_collections(vector<coll_t>& ls)
       }
     } else if (de->d_type != DT_DIR) {
       continue;
-    } else if (strcmp(de->d_name, "omap") == 0) {
+    }
+    if (strcmp(de->d_name, "omap") == 0) {
       continue;
     }
     if (de->d_name[0] == '.' &&