From: Danny Al-Gaaf Date: Thu, 28 Feb 2013 18:41:37 +0000 (+0100) Subject: librbd/internal.cc: reduce scope of 'int r' X-Git-Tag: v0.59~61^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c12d91e9e29636f134692e9bab083b83d7705b34;p=ceph.git librbd/internal.cc: reduce scope of 'int r' Signed-off-by: Danny Al-Gaaf --- diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index df73a94050a..0a98a56578e 100644 --- a/src/librbd/internal.cc +++ b/src/librbd/internal.cc @@ -1574,7 +1574,6 @@ reprotect_and_return_err: int refresh_seq = ictx->refresh_seq; ictx->refresh_lock.Unlock(); - int r; ::SnapContext new_snapc; bool new_snap = false; vector snap_names; @@ -1585,6 +1584,7 @@ reprotect_and_return_err: { RWLock::WLocker l(ictx->snap_lock); { + int r; RWLock::WLocker l2(ictx->parent_lock); ictx->lockers.clear(); if (ictx->old_format) {