From patchwork Thu Sep 11 23:07:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darrick Wong X-Patchwork-Id: 388432 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1713A14010C for ; Fri, 12 Sep 2014 09:08:07 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751624AbaIKXIG (ORCPT ); Thu, 11 Sep 2014 19:08:06 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:34492 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751105AbaIKXIE (ORCPT ); Thu, 11 Sep 2014 19:08:04 -0400 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s8BN81Vf011534 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 11 Sep 2014 23:08:02 GMT Received: from userz7022.oracle.com (userz7022.oracle.com [156.151.31.86]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s8BN80q7024522 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 11 Sep 2014 23:08:01 GMT Received: from abhmp0005.oracle.com (abhmp0005.oracle.com [141.146.116.11]) by userz7022.oracle.com (8.14.5+Sun/8.14.4) with ESMTP id s8BN7xGB027727; Thu, 11 Sep 2014 23:08:00 GMT Received: from localhost (/24.21.154.84) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 11 Sep 2014 16:07:59 -0700 Date: Thu, 11 Sep 2014 16:07:58 -0700 From: "Darrick J. Wong" To: "Theodore Ts'o" Cc: linux-ext4@vger.kernel.org Subject: Re: [PATCH 00/25] e2fsprogs Summer 2014 patchbomb, part 5.2 Message-ID: <20140911230758.GB11640@birch.djwong.org> References: <20140908231135.25904.66591.stgit@birch.djwong.org> <20140911223347.GH17990@thunk.org> <20140911225022.GA10351@birch.djwong.org> <20140911225223.GJ17990@thunk.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20140911225223.GJ17990@thunk.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org On Thu, Sep 11, 2014 at 06:52:23PM -0400, Theodore Ts'o wrote: > On Thu, Sep 11, 2014 at 03:50:22PM -0700, Darrick J. Wong wrote: > > > > Looks like most everything landed ok except for: > > > > Yikes, make check explodes: > > Hmm, works for me. Could you make sure you've done a "make clean" and > also a "git clean"? In particular, make sure you don't have a > leftover file in debugfs/jfs_user.h.... There aren't any stray jfs_user.h files, but rearranging DEBUGFS_CFLAGS seems to fix it. On Ubuntu 14.04 it seems that the compile command for lib/ext2fs/journal.o is: gcc -I. -I../../lib -I../../lib -Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -DHAVE_CONFIG_H -I./../../e2fsck -DDEBUGFS -c ../../debugfs/journal.c -o journal.o ...which means that it picks up lib/ext2fs/jfs_user.h instead of the one in e2fsck/. The attached patch changes it to: gcc -I./../../e2fsck -I. -I../../lib -I../../lib -Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -DHAVE_CONFIG_H -DDEBUGFS -c ../../debugfs/journal.c -o journal.o ...which runs the compile ok. --D --- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in index 597bed6..bc0dc8a 100644 --- a/lib/ext2fs/Makefile.in +++ b/lib/ext2fs/Makefile.in @@ -7,7 +7,7 @@ INSTALL = @INSTALL@ DEPEND_CFLAGS = -I$(top_srcdir)/debugfs -I$(srcdir)/../../e2fsck -DDEBUGFS # This nastyness is needed because of jfs_user.h hackery; when we finally # clean up this mess, we should be able to drop it -DEBUGFS_CFLAGS = $(ALL_CFLAGS) -I$(srcdir)/../../e2fsck -DDEBUGFS +DEBUGFS_CFLAGS = -I$(srcdir)/../../e2fsck $(ALL_CFLAGS) -DDEBUGFS @MCONFIG@