Hi Ted,
Today's linux-next build (powerpc ppc64_defconfig) failed like this after
the slab tree was merged:
In file included from fs/jbd2/checkpoint.c:26:
include/trace/events/jbd2.h:11: error: expected ')' before '(' token
include/trace/events/jbd2.h:31: error: expected ')' before '(' token
include/trace/events/jbd2.h:54: error: expected ')' before '(' token
include/trace/events/jbd2.h:77: error: expected ')' before '(' token
include/trace/events/jbd2.h:100: error: expected ')' before '(' token
include/trace/events/jbd2.h:122: error: expected ')' before '(' token
include/trace/events/jbd2.h:146: error: expected ')' before '(' token
fs/jbd2/checkpoint.c: In function 'jbd2_log_do_checkpoint':
fs/jbd2/checkpoint.c:361: error: implicit declaration of function 'trace_jbd2_checkpoint'
It looks like TRACE_EVENT is not defined.
The config differences are:
CONFIG_SLUB_DEBUG and CONFIG_SLUB change from y to n
CONFIG_SLQB_ALLOCATOR, CONFIG_SLQB and CONFIG_SLQB_DEBUG become y
The .i files looks very different (the bad one has TRACE_EVENT explictly
in there, while the other has it expanded). It appears that some of the
tracing include files that should have been included explicitly were
being included implicitly by the slub include files.
So I have reverted commit 75ef2ffeb02c7e1fbe8114f2fddd2e8880397892
("jbd2: convert instrumentation from markers to tracepoints") for today.
This produced another error:
In file included from include/trace/ftrace.h:262,
from include/trace/define_trace.h:57,
from include/trace/events/ext4.h:720,
from fs/ext4/super.c:51:
include/trace/events/ext4.h: In function 'ftrace_raw_output_ext4_free_inode':
include/trace/events/ext4.h:12: error: implicit declaration of function 'jbd2_dev_to_name'
So I also reverted commit a6e130e94db16b324fbf2eeed2b310273625acf7 ("ext4: convert instrumentation from markers to tracepoints") after reverting the dependent commit 3f9c083c0ffd344da212c9813c3c5ddba1a65936 ("ext4: Fix 64-bit block type problem on 32-bit platforms") for today.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Tue, Jun 16, 2009 at 02:44:13PM +1000, Stephen Rothwell wrote:
> Hi Ted,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this after
> the slab tree was merged:
>
> In file included from fs/jbd2/checkpoint.c:26:
> include/trace/events/jbd2.h:11: error: expected ')' before '(' token
> include/trace/events/jbd2.h:31: error: expected ')' before '(' token
Hmm... I wonder why the slab tree would be messing with tracing
include files.
Which slab tree is it? Is it Pekka's?
git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git
- Ted
On Tue, Jun 16, 2009 at 04:30:34PM -0400, Theodore Tso wrote:
> On Tue, Jun 16, 2009 at 02:44:13PM +1000, Stephen Rothwell wrote:
> > Hi Ted,
> >
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this after
> > the slab tree was merged:
> >
> > In file included from fs/jbd2/checkpoint.c:26:
> > include/trace/events/jbd2.h:11: error: expected ')' before '(' token
> > include/trace/events/jbd2.h:31: error: expected ')' before '(' token
>
> Hmm... I wonder why the slab tree would be messing with tracing
> include files.
>
> Which slab tree is it? Is it Pekka's?
>
> git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git
>
Never mind, I see the problem. Thanks for pointing it out!
- Ted
Hi Ted,
Theodore Tso wrote:
> On Tue, Jun 16, 2009 at 02:44:13PM +1000, Stephen Rothwell wrote:
>> Hi Ted,
>>
>> Today's linux-next build (powerpc ppc64_defconfig) failed like this after
>> the slab tree was merged:
>>
>> In file included from fs/jbd2/checkpoint.c:26:
>> include/trace/events/jbd2.h:11: error: expected ')' before '(' token
>> include/trace/events/jbd2.h:31: error: expected ')' before '(' token
>
> Hmm... I wonder why the slab tree would be messing with tracing
> include files.
>
> Which slab tree is it? Is it Pekka's?
>
> git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git
Yup, that's it. I looked at this yesterday but didn't see anything
suspicious. I don't think I have any patches that mess with any tracing
include files. The only major change there should be the new default
SLQB allocator. Perhaps ext4 is simply missing some includes that are
pulled by SLUB but not SLQB?
Pekka
Hi Ted,
On Tue, 16 Jun 2009 18:11:47 -0400 Theodore Tso <[email protected]> wrote:
>
> On Tue, Jun 16, 2009 at 04:30:34PM -0400, Theodore Tso wrote:
> > On Tue, Jun 16, 2009 at 02:44:13PM +1000, Stephen Rothwell wrote:
> > > Hi Ted,
> > >
> > > Today's linux-next build (powerpc ppc64_defconfig) failed like this after
> > > the slab tree was merged:
> > >
> > > In file included from fs/jbd2/checkpoint.c:26:
> > > include/trace/events/jbd2.h:11: error: expected ')' before '(' token
> > > include/trace/events/jbd2.h:31: error: expected ')' before '(' token
> >
> > Hmm... I wonder why the slab tree would be messing with tracing
> > include files.
> >
> > Which slab tree is it? Is it Pekka's?
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git
> >
>
> Never mind, I see the problem. Thanks for pointing it out!
Because of this, I will use the ext4 tree that was in next-20090615
(which is actually empty relative to Linus tree) until you can come up
with a fix.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/