Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751052AbWIYICB (ORCPT ); Mon, 25 Sep 2006 04:02:01 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751269AbWIYICB (ORCPT ); Mon, 25 Sep 2006 04:02:01 -0400 Received: from omx2-ext.sgi.com ([192.48.171.19]:39631 "EHLO omx2.sgi.com") by vger.kernel.org with ESMTP id S1751052AbWIYICA (ORCPT ); Mon, 25 Sep 2006 04:02:00 -0400 Message-ID: <45178D19.5000803@sgi.com> Date: Mon, 25 Sep 2006 18:02:33 +1000 From: Timothy Shimmin User-Agent: Thunderbird 1.5.0.7 (Macintosh/20060909) MIME-Version: 1.0 To: Andrew Morton CC: Eric Sandeen , Linux Kernel Mailing List , xfs mailing list Subject: Re: [PATCH -mm] rescue large xfs preferred iosize from the inode diet patch References: <45131334.6050803@sandeen.net> <45134472.7080002@sgi.com> <20060922161040.609286fa.akpm@osdl.org> In-Reply-To: <20060922161040.609286fa.akpm@osdl.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2176 Lines: 57 Andrew Morton wrote: > On Fri, 22 Sep 2006 12:03:30 +1000 >> Looked at your patch and then at our xfs code in the tree and >> the existing code is different than what yours is based on. >> I then noticed in the logs Nathan has actually made changes for this: >> >> ---------------------------- >> revision 1.254 >> date: 2006/07/17 10:46:05; author: nathans; state: Exp; lines: +20 -5 >> modid: xfs-linux-melb:xfs-kern:26565a >> Update XFS for i_blksize removal from generic inode structure >> ---------------------------- >> I even reviewed the change (and I don't remember it - getting old). >> >> I looked at the mods scheduled for 2.6.19 and this is one of them. >> >> So the fix for this is coming soon (and the fix is different from the >> one above). >> > > eh? Eric's patch is based on -mm, which includes the XFS git tree. If I > go and merge the inode-diet patches from -mm, XFS gets broken until you > guys merge the above mystery patch. (I prefer to merge the -mm patches > after all the git trees have gone, but sometimes maintainers dawdle and I > get bored of waiting). > > Is git://oss.sgi.com:8090/nathans/xfs-2.6 obsolete, or are you hiding stuff > from me? ;) > :) We're still getting our act together since Nathan is no longer here. Going forward the new git tree is at: git://oss.sgi.com:8090/xfs/xfs-2.6 This has some more recent changes than the "nathans" one but is far from up to date with the internal sgi tree and the external cvs tree (as you noticed with the nathans one:). I will get the "xfs" one updated in the next day or so. (Aside: for some strange reason, the "nathans" one has 3 extra mods (commits) and as expected (to me:) the "xfs" one has 10 extra mods (commits) and there is about 46 mods (including missing 3) pending for the "xfs" tree. If we end up moving from our internal SCM to git at some point, this could make the updates less of a hassle:). --Tim - 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/