]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7f61072 5806226)
Merge branch 'wip-4249' into wip-4249-master
authorJosh Durgin <josh.durgin@inktank.com>
Mon, 25 Feb 2013 20:05:16 +0000 (12:05 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Mon, 25 Feb 2013 20:12:04 +0000 (12:12 -0800)
commitdb5fc2270f91aae220fc3c97b0c62e92e263527b
tree2617fe7f7ed97480e4d532dec42ddeedaf086eebtree | snapshot
parent7f61072ad631096e3657ff94ddfb35ed1b7e8111commit | diff
parent5806226cf0743bb44eaf7bc815897c6846d43233commit | diff
Merge branch 'wip-4249' into wip-4249-master

Make snap_rollback() only take a read lock on snap_lock, since
it does not modify snapshot-related fields.
Conflicts:
src/librbd/internal.cc
src/librbd/internal.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.