2010-12-09 17:51:00

by Sage Weil

[permalink] [raw]
Subject: [GIT PULL] Ceph updates for 2.6.37-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 is a readdir NULL dereference after llseeking to odd offsets,
several fixes for flock/fcntl locks, and a fix for the ioctl magic value
that crept into -rc1.

Thanks!
sage


Herb Shiu (3):
ceph: Handle file locks in replies from the MDS.
ceph: pass lock information by struct file_lock instead of as individual params.
ceph: Behave better when handling file lock replies.

Sage Weil (2):
ceph: avoid possible null deref in readdir after dir llseek
ceph: fix ioctl magic

fs/ceph/dir.c | 4 +-
fs/ceph/ioctl.h | 2 +-
fs/ceph/locks.c | 94 ++++++++++++++++++++++++++-----------------------
fs/ceph/mds_client.c | 41 +++++++++++++++++++--
fs/ceph/mds_client.h | 31 +++++++++++-----
5 files changed, 111 insertions(+), 61 deletions(-)