]> 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: 37dd1f0 64b104c)
Merge branch 'wip-13800' of git://github.com/ukernel/ceph
authorGreg Farnum <gfarnum@redhat.com>
Wed, 25 Nov 2015 22:21:38 +0000 (14:21 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Wed, 25 Nov 2015 22:21:38 +0000 (14:21 -0800)
commit5090744560931a16322a73d302fb30dda30d90a8
tree60a55c8befdcf5450b4942efc5b59c9f3ed5293dtree | snapshot
parent37dd1f00e2f367926935b9dc05be80c96d796600commit | diff
parent64b104cbb6312d96e04e78b56485075e7afc7477commit | diff
Merge branch 'wip-13800' of git://github.com/ukernel/ceph

client: fix deadlock related to async pagecache invalidation

Conflicts:
src/client/Client.cc
Fixed a conflict with the earlier page cache invalidate
changes in 73beb7f9378182cc3901fe86c4f1f5d5d98169a6.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
src/client/Client.cc diff1 | diff2 | blob | history
src/client/Client.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.