From: Yuri Weinstein <yuri.weinstein@gmail.com>
Date: Wed, 31 Jan 2018 21:21:50 +0000 (-0800)
Subject: Merge pull request #20121 from batrick/i21252p2
X-Git-Tag: v12.2.3~95
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=427bad3aae9b427fe7308e91e965e57a29964918;p=ceph.git

Merge pull request #20121 from batrick/i21252p2

luminous: mds: fix return value of MDCache::dump_cache

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

427bad3aae9b427fe7308e91e965e57a29964918
diff --cc src/mds/MDCache.cc
index 6df775b5a34,c4677c80efa..298799f0d95
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@@ -12003,19 -12003,8 +12003,20 @@@ int MDCache::dump_cache(const char *fn
      if (f) {
        f->close_section();  // inode
      }
 +    return 1;
 +  };
 +
 +  for (auto p : inode_map) {
 +    r = dump_func(p.second);
 +    if (r < 0)
 +      goto out;
 +  }
 +  for (auto p : snap_inode_map) {
 +    r = dump_func(p.second);
 +    if (r < 0)
 +      goto out;
    }
+   r = 0;
  
   out:
    if (f) {