Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764427AbXKNWtM (ORCPT ); Wed, 14 Nov 2007 17:49:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755433AbXKNWs5 (ORCPT ); Wed, 14 Nov 2007 17:48:57 -0500 Received: from ns2.g-housing.de ([81.169.133.75]:47911 "EHLO mail.g-house.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755378AbXKNWs5 (ORCPT ); Wed, 14 Nov 2007 17:48:57 -0500 Date: Wed, 14 Nov 2007 23:48:46 +0100 (CET) From: Christian Kujau X-X-Sender: evil@sheep.housecafe.de To: Chris Wedgwood cc: linux-xfs@oss.sgi.com, Christoph Hellwig , David Chinner , LKML , Benny Halevy Subject: Re: 2.6.24-rc2 XFS nfsd hang --- filldir change responsible? In-Reply-To: <20071114114907.GA31466@puku.stupidest.org> Message-ID: References: <20071114070400.GA25708@puku.stupidest.org> <20071114114907.GA31466@puku.stupidest.org> User-Agent: Alpine 0.99999 (DEB 796 2007-11-08) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1516 Lines: 41 On Wed, 14 Nov 2007, Chris Wedgwood wrote: > After some bisection pain (sg broken in the middle and XFS not > compiling in other places) the regression seems to be: > > commit 051e7cd44ab8f0f7c2958371485b4a1ff64a8d1b > Author: Christoph Hellwig > Date: Tue Aug 28 13:58:24 2007 +1000 Following a git-bisect howto[0], I tried to revert this commit: # git checkout master # git revert 051e7cd44ab8f0f7c2958371485b4a1ff64a8d1b Auto-merged fs/xfs/linux-2.6/xfs_file.c CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_file.c Auto-merged fs/xfs/linux-2.6/xfs_vnode.h CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_vnode.h Auto-merged fs/xfs/xfs_dir2.c CONFLICT (content): Merge conflict in fs/xfs/xfs_dir2.c Auto-merged fs/xfs/xfs_dir2.h Auto-merged fs/xfs/xfs_dir2_block.c Auto-merged fs/xfs/xfs_dir2_sf.c Auto-merged fs/xfs/xfs_vnodeops.c CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.c Automatic revert failed. After resolving the conflicts, mark the corrected paths with 'git add ' and commit the result. Any ideas? Christian [0] is this still up-to-date? http://kernel.org/pub/software/scm/git/docs/v1.4.4.4/howto/isolate-bugs-with-bisect.txt -- BOFH excuse #423: It's not RFC-822 compliant. - 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/