From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031613Ab2CSO65 (ORCPT ); Mon, 19 Mar 2012 10:58:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35528 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030697Ab2CSO64 (ORCPT ); Mon, 19 Mar 2012 10:58:56 -0400 Subject: Re: GFS2: Pre-pull patch posting (merge window) From: Steven Whitehouse To: Randy Dunlap Cc: linux-kernel@vger.kernel.org, cluster-devel@redhat.com, teigland@redhat.com In-Reply-To: <4F674696.7030602@xenotime.net> References: <1332152728-4027-1-git-send-email-swhiteho@redhat.com> <4F674696.7030602@xenotime.net> Content-Type: text/plain; charset="UTF-8" Organization: Red Hat UK Ltd Date: Mon, 19 Mar 2012 14:59:13 +0000 Message-ID: <1332169153.2689.20.camel@menhir> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Mon, 2012-03-19 at 07:45 -0700, Randy Dunlap wrote: > On 03/19/2012 03:25 AM, Steven Whitehouse wrote: > > > Hi, > > > > Not a huge number of patches this time. Some notable new features > > though: > > - Glock stats gathering (v. useful for performance analysis) > > - FITRIM ioctl support > > - Sorting the ordered write list (big performance increase when the workload > > doesn't result in the write requests being nicely ordered to start with) > > > > Plus a few clean ups, and bug fixes in addition, > > > > Hi, > > I reported a build error in linux-next 20120313, but it appears > that mainline also needs the fix (when it's ready) since mainline > gfs2 Kconfig selects DLM_SCTP, which does not exist. > > https://lkml.org/lkml/2012/3/13/456 > Does the following fix the problem? If so then I'll roll that into the tree before it gets pushed, Steve. diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig index c465ae0..f4e1c60 100644 --- a/fs/gfs2/Kconfig +++ b/fs/gfs2/Kconfig @@ -4,7 +4,7 @@ config GFS2_FS select DLM if GFS2_FS_LOCKING_DLM select CONFIGFS_FS if GFS2_FS_LOCKING_DLM select SYSFS if GFS2_FS_LOCKING_DLM - select IP_SCTP if DLM_SCTP + select IP_SCTP if GFS2_FS_LOCKING_DLM select FS_POSIX_ACL select CRC32 select QUOTACTL