From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934466AbZIDXJf (ORCPT ); Fri, 4 Sep 2009 19:09:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934435AbZIDXJe (ORCPT ); Fri, 4 Sep 2009 19:09:34 -0400 Received: from acsinet11.oracle.com ([141.146.126.233]:27345 "EHLO acsinet11.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934384AbZIDXJd (ORCPT ); Fri, 4 Sep 2009 19:09:33 -0400 Date: Fri, 4 Sep 2009 16:06:34 -0700 From: Joel Becker To: Linus Torvalds Cc: Mark Fasheh , Andrew Morton , linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com Subject: [GIT PULL] Critical ocfs2 fixes for 2.6.31-rc8 Message-ID: <20090904230633.GB945@mail.oracle.com> Mail-Followup-To: Linus Torvalds , Mark Fasheh , Andrew Morton , linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-Source-IP: acsmt355.oracle.com [141.146.40.155] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090208.4AA19E0E.0047:SCFMA4539814,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus, et al, Here are two important ocfs2 fixes for 2.6.31. One is absolutely critical, if fixes an mmap bug introduced by the fix in commit e7432675f8ca868a4af365759a8d4c3779a3d922. Please pull. Joel The following changes since commit c795b33ba171e41563ab7e25105c0cd4edd81cd7: Goldwyn Rodrigues (1): ocfs2/dlm: Wait on lockres instead of erroring cancel requests are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git upstream-linus Sunil Mushran (1): ocfs2: ocfs2_write_begin_nolock() should handle len=0 Tao Ma (1): ocfs2: invalidate dentry if its dentry_lock isn't initialized. fs/ocfs2/aops.c | 4 ++-- fs/ocfs2/dcache.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) -- Life's Little Instruction Book #99 "Think big thoughts, but relish small pleasures." Joel Becker Principal Software Developer Oracle E-mail: joel.becker@oracle.com Phone: (650) 506-8127