2015-08-03 14:39:27

by Sage Weil

[permalink] [raw]
Subject: [GIT PULL] Ceph fixes for -rc6

Hi Linus,

Please pull the following Ceph fixes from

git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git for-linus

There are two critical regression fixes for CephFS from Zheng, and an RBD
completion fix for layered images from Ilya.

(Note: git request-pull is complaining that the for-linus branch isn't
referencing the right commit even though it is... hopefully I'm not doing
something stupid. The right commit is
2761713d35e370fd640b5781109f753066b746c4.)

Thanks!
sage

----------------------------------------------------------------
Ilya Dryomov (1):
rbd: fix copyup completion race

Yan, Zheng (2):
ceph: fix ceph_encode_locks_to_buffer()
ceph: always re-send cap flushes when MDS recovers

drivers/block/rbd.c | 22 +++++++++++++++++-----
fs/ceph/caps.c | 22 +++++-----------------
fs/ceph/locks.c | 2 +-
fs/ceph/super.h | 1 -
4 files changed, 23 insertions(+), 24 deletions(-)