]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
librbd: acquire exclusive-lock during copy on read 14543/head
authorVenky Shankar <vshankar@redhat.com>
Mon, 20 Feb 2017 06:34:10 +0000 (12:04 +0530)
committerNathan Cutler <ncutler@suse.com>
Mon, 3 Jul 2017 10:44:11 +0000 (12:44 +0200)
commitc79d45ff52a636c136e0c5f8aec7911c04601b6f
tree3c418a69407c542a5600a3f0a755f4e65c39440e
parentf31033cb5bc7764b44871c15717aed5a34921881
librbd: acquire exclusive-lock during copy on read

Fixes: http://tracker.ceph.com/issues/18888
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 7dba5311b12011a4a6e8564e68150e54c5af5ddd)

Conflicts:
    src/librbd/AioImageRequestWQ.h:
      - in master this file has morphed into src/librbd/io/ImageRequestWQ.h
      - kraken has AioImageRequest<ImageCtx> instead of ImageRequest<ImageCtx>
    src/librbd/image/RefreshRequest.cc:
      - rename image context element to "aio_work_queue" (from "io_work_queue")
        because kraken doesn't have de95d862f57b56738e04d77f2351622f83f17f4a
    src/test/librbd/image/test_mock_RefreshRequest.cc:
      - rename image context element to "aio_work_queue" (from "io_work_queue")
        because kraken doesn't have de95d862f57b56738e04d77f2351622f83f17f4a
src/librbd/AioImageRequestWQ.h
src/librbd/image/RefreshRequest.cc
src/test/librbd/image/test_mock_RefreshRequest.cc
src/test/librbd/mock/MockAioImageRequestWQ.h
src/test/librbd/mock/MockImageCtx.h