]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f8a397 4a709a4)
Merge pull request #4854 from ceph/wip-11769-firefly
authorNathan Cutler <presnypreklad@gmail.com>
Thu, 3 Sep 2015 10:34:32 +0000 (12:34 +0200)
committerNathan Cutler <presnypreklad@gmail.com>
Thu, 3 Sep 2015 10:34:32 +0000 (12:34 +0200)
librbd: aio calls may block

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/librbd/ImageCtx.cc patch | diff1 | diff2 | blob | history
src/librbd/internal.cc patch | diff1 | diff2 | blob | history

diff --cc src/librbd/ImageCtx.cc
Simple merge
diff --cc src/librbd/internal.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.