]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
librbd: allow snapshots to be created when snapshot is active
authorJason Dillaman <dillaman@redhat.com>
Mon, 27 Apr 2015 05:00:38 +0000 (01:00 -0400)
committerJason Dillaman <dillaman@redhat.com>
Wed, 6 May 2015 15:52:06 +0000 (11:52 -0400)
commitaf8939be80310e234745fe81e67244ab52c6add5
tree3641b4262a583c29a81c38b9a68170ad9521f36a
parentd21c0c00d2bed282677d2063a3fb6f5346641286
librbd: allow snapshots to be created when snapshot is active

The librbd API previously permitted the creation of snapshots while
the image context was associated to another snapshot.  A recent code
cleanup broke that ability, so this re-introduces it.  The code change
also allows minor cleanup with rebuild_object_map.

Fixes: #11475
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 594a6610802f2cadb62200815bd8b9860809e759)

Conflicts:
src/librbd/internal.cc
src/librbd/internal.cc