Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752157Ab0LXAQr (ORCPT ); Thu, 23 Dec 2010 19:16:47 -0500 Received: from rcsinet10.oracle.com ([148.87.113.121]:64572 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751689Ab0LXAQq (ORCPT ); Thu, 23 Dec 2010 19:16:46 -0500 Date: Thu, 23 Dec 2010 16:16:37 -0800 From: Joel Becker To: Linus Torvalds Cc: Mark Fasheh , Andrew Morton , linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com Subject: [GIT PULL] ocfs2 fixes for 2.6.37-rc7 Message-ID: <20101224001637.GA25361@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) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1535 Lines: 41 Dear Linus et al, Here are hopefully the last remaining ocfs2 fixes for 2.6.37-rc. The most important are a fix for the new coherency mode added in the merge window and a regression fix for users with quota enabled. Please pull. Joel The following changes since commit b0c3844d8af6b9f3f18f31e1b0502fbefa2166be: Linux 2.6.37-rc6 (2010-12-15 17:24:48 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git upstream-linus Sunil Mushran (2): ocfs2/dlm: Migrate lockres with no locks if it has a reference ocfs2: Adjust masklog flag values Tao Ma (2): ocfs2: Hold ip_lock when set/clear flags for indexed dir. ocfs2: Fix system inodes cache overflow. Tristan Ye (1): Ocfs2: Teach 'coherency=full' O_DIRECT writes to correctly up_read i_alloc_sem. fs/ocfs2/aops.c | 7 +++++-- fs/ocfs2/aops.h | 23 +++++++++++++++++++++-- fs/ocfs2/cluster/masklog.c | 3 ++- fs/ocfs2/cluster/masklog.h | 15 ++++++++------- fs/ocfs2/dir.c | 4 ++++ fs/ocfs2/dlm/dlmmaster.c | 40 +++++++++++++++++++++++++++------------- fs/ocfs2/file.c | 15 +++++++++++++-- fs/ocfs2/ocfs2_fs.h | 2 +- 8 files changed, 81 insertions(+), 28 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/