From: Josh Durgin <josh.durgin@inktank.com>
Date: Tue, 6 May 2014 18:18:28 +0000 (-0700)
Subject: librbd: check return value during snap_unprotect
X-Git-Tag: v0.81~55^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1775%2Fhead;p=ceph.git

librbd: check return value during snap_unprotect

This would only fail if the header object was corrupted, so it's
unlikely to occur in practice.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
---

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index e56ef0897f48..1d0e43f4ac44 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -664,6 +664,11 @@ namespace librbd {
 					  ictx->header_oid,
 					  snap_id,
 					  RBD_PROTECTION_STATUS_UNPROTECTED);
+    if (r < 0) {
+      lderr(ictx->cct) << "snap_unprotect: error setting unprotected status"
+		       << dendl;
+      goto reprotect_and_return_err;
+    }
     notify_change(ictx->md_ctx, ictx->header_oid, NULL, ictx);
     return 0;