Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756456Ab0LIRvA (ORCPT ); Thu, 9 Dec 2010 12:51:00 -0500 Received: from cobra.newdream.net ([66.33.216.30]:58817 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756351Ab0LIRu6 (ORCPT ); Thu, 9 Dec 2010 12:50:58 -0500 Date: Thu, 9 Dec 2010 09:55:55 -0800 (PST) From: Sage Weil To: torvalds@linux-foundation.org cc: linux-kernel@vger.kernel.org, ceph-devel@vger.kernel.org Subject: [GIT PULL] Ceph updates for 2.6.37-rc6 Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1180 Lines: 34 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(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/