From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Mon, 29 Feb 2016 19:06:30 +0000 (+0800)
Subject: osd: replicatedpg: break out if we encounter error during do_pg_op()
X-Git-Tag: v10.1.0~193^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=201e1742f964cd830f7f377cc5d95335c91e05c9;p=ceph.git

osd: replicatedpg: break out if we encounter error during do_pg_op()

Otherwise:
1. The error result may be overwritten and hidden.
2. There may be potential memory leak.

Fixes: #14922
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 6f5a91dac124..9d0e55e90e2b 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1301,6 +1301,9 @@ void ReplicatedPG::do_pg_op(OpRequestRef op)
       result = -EINVAL;
       break;
     }
+
+    if (result < 0)
+      break;
   }
 
   // reply