diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-24 16:13:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-24 16:13:49 -0700 |
commit | bee2d97b2c4583c2471aa65ab9c189a0011f62b3 (patch) | |
tree | 74bcd6a17f3db312268b4ad25aa05a1912ff174f /fs/eventpoll.c | |
parent | 979570e02981d4a8fc20b3cc8fd651856c98ee9d (diff) | |
parent | 5ce765a540f34d1e2005e1210f49f67fdf11e997 (diff) | |
download | op-kernel-dev-bee2d97b2c4583c2471aa65ab9c189a0011f62b3.zip op-kernel-dev-bee2d97b2c4583c2471aa65ab9c189a0011f62b3.tar.gz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull two ceph fixes from Sage Weil:
"The first fixes a leak in the rbd setup error path, and the second
fixes a more serious problem with mismatched kmap/kunmap that surfaced
after the recent refactoring work."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
libceph: only kunmap kmapped pages
rbd: drop dev reference on error in rbd_open()
Diffstat (limited to 'fs/eventpoll.c')
0 files changed, 0 insertions, 0 deletions