From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934034Ab0HLW1m (ORCPT ); Thu, 12 Aug 2010 18:27:42 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:24800 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760937Ab0HLW1l (ORCPT ); Thu, 12 Aug 2010 18:27:41 -0400 Date: Thu, 12 Aug 2010 15:26:22 -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] ocfs2 changes for 2.6.36, part 1. Message-ID: <20100812222622.GB22777@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 Linus et al, Here is the first batch of ocfs2 changes for 2.6.36. I apologize for the LSF delay. These fixes have been stewing for a while and I wanted to get them to you. The remaining batch of changes are waiting on procedural agreement from the jbd2 folks. I'll send them along as soon as we have consensus. Please pull. Joel The following changes since commit 9fe6206f400646a2322096b56c59891d530e8d51: Linux 2.6.35 (2010-08-01 15:11:14 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git fixes Jiaju Zhang (1): Fix the nested PR lock calling issue in ACL Srinivas Eeda (1): ocfs2 fix o2dlm dlm run purgelist (rev 3) Tao Ma (1): ocfs2: Count more refcount records in file system fragmentation. Tiger Yang (1): ocfs2: do not overwrite error codes in ocfs2_init_acl Tristan Ye (1): O2net: Disallow o2net accept connection request from itself. Wengang Wang (3): ocfs2/dlm: fix a dead lock ocfs2/dlm: avoid incorrect bit set in refmap on recovery master ocfs2/dlm: remove potential deadlock -V3 fs/ocfs2/acl.c | 33 +++++++++++-- fs/ocfs2/cluster/tcp.c | 17 +++++-- fs/ocfs2/dlm/dlmmaster.c | 9 +--- fs/ocfs2/dlm/dlmrecovery.c | 22 ++++----- fs/ocfs2/dlm/dlmthread.c | 114 +++++++++++++++++++++----------------------- fs/ocfs2/refcounttree.c | 20 ++++++-- 6 files changed, 122 insertions(+), 93 deletions(-)