From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933014Ab0J1Hup (ORCPT ); Thu, 28 Oct 2010 03:50:45 -0400 Received: from smtp-out-246.synserver.de ([212.40.180.246]:1062 "HELO smtp-out-245.synserver.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with SMTP id S932884Ab0J1Hum (ORCPT ); Thu, 28 Oct 2010 03:50:42 -0400 X-SynServer-TrustedSrc: 1 X-SynServer-AuthUser: markus@trippelsdorf.de X-SynServer-PPID: 19076 Date: Thu, 28 Oct 2010 09:50:39 +0200 From: Markus Trippelsdorf To: "Theodore Ts'o" Cc: Linus Torvalds , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [GIT PULL] ext4 update for 2.6.37 Message-ID: <20101028075038.GC1580@arch.trippelsdorf.de> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 28, 2010 at 12:52:07AM -0400, Theodore Ts'o wrote: > Hi Linus, > > Please pull from: > > git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus > or > git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git upstream-merge > > the merge is somewhat complex, since there's been a lot of work going on > in parallel with discard and zeroout changes, as well as the change > block_prepare_write/__block_write_begin. The changes pass the xfstests > regression test suite, using both 1k and 4k block sizes --- both before > the upstream merge (the for_linus branch) and after doing a trial merge > with the head of your tree as of Wednesday evening (the upstream-merge > branch). This misses a trivial ifdef wrapper in fs/ext4/super.c for !CONFIG_EXT4_FS_XATTR configurations. Something like this: diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 0348ce0..5f82585 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4773,9 +4773,12 @@ static int __init ext4_init_fs(void) if (err) goto out3; +#ifdef CONFIG_EXT4_FS_XATTR err = ext4_init_xattr(); +#endif if (err) goto out2; + err = init_inodecache(); if (err) goto out1; -- Markus