linux-next: xfs build failure

linux-next: xfs build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 726 bytes --]

Hi all,

Today's linux-next build (powerpc ppc64_defconfig) fails like this:

fs/xfs/xfs_ialloc.c: In function 'xfs_ialloc_ag_alloc':
fs/xfs/xfs_ialloc.c:301: error: implicit declaration of function 'random32'

I added

#include <linux/random.h>

after the other includes in fs/xfs/xfs_ialloc.c, but there is probably a
better fix.

The commit that seems to have caused this
6309a0720469beb77e0ab75f403a98a0aba4140c ("XFS] Don't initialise new
inode generation numbers to zero") in the xfs tree that I have seems to
have just gone into Linus' tree as commit
359346a9655c8800408ed3ca44517ac7ea95c197.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: linux-next: xfs build failure

[David Chinner]

On Wed, Apr 30, 2008 at 02:00:27PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next build (powerpc ppc64_defconfig) fails like this:
> 
> fs/xfs/xfs_ialloc.c: In function 'xfs_ialloc_ag_alloc':
> fs/xfs/xfs_ialloc.c:301: error: implicit declaration of function 'random32'
> 
> I added
> 
> #include <linux/random.h>
> 
> after the other includes in fs/xfs/xfs_ialloc.c, but there is probably a
> better fix.
> 
> The commit that seems to have caused this
> 6309a0720469beb77e0ab75f403a98a0aba4140c ("XFS] Don't initialise new
> inode generation numbers to zero") in the xfs tree that I have seems to
> have just gone into Linus' tree as commit
> 359346a9655c8800408ed3ca44517ac7ea95c197.

Ah, I see the problem - a CONFIG_XFS_DEBUG build includes linux/random.h
in a debug header file. That's probably why I didn't catch it (I need to
check the .config on my build test tree).

I'll get it fixed properly, but in the mean time the include you've got
there will suffice...

Cheers,

Dave.
-- 
Dave Chinner
Principal Engineer
SGI Australian Software Group

Re: linux-next: xfs build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 718 bytes --]

Hi David,

On Wed, 30 Apr 2008 16:35:44 +1000 David Chinner <dgc@sgi.com> wrote:
>
> Ah, I see the problem - a CONFIG_XFS_DEBUG build includes linux/random.h
> in a debug header file. That's probably why I didn't catch it (I need to
> check the .config on my build test tree).
> 
> I'll get it fixed properly, but in the mean time the include you've got
> there will suffice...

Could you make sure something gets sent to Linus pretty quickly as this
breaks a lot of the powerpc builds at the moment (see
http://kisskb.ellerman.id.au/kisskb/branch/3/).  Or should I do my patch
up and sent it?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

[PATCH, XFS] Fix random.h include for non-debug builds

[David Chinner]

On Wed, Apr 30, 2008 at 04:42:18PM +1000, Stephen Rothwell wrote:
> Hi David,
> 
> On Wed, 30 Apr 2008 16:35:44 +1000 David Chinner <dgc@sgi.com> wrote:
> >
> > Ah, I see the problem - a CONFIG_XFS_DEBUG build includes linux/random.h
> > in a debug header file. That's probably why I didn't catch it (I need to
> > check the .config on my build test tree).
> > 
> > I'll get it fixed properly, but in the mean time the include you've got
> > there will suffice...
> 
> Could you make sure something gets sent to Linus pretty quickly as this
> breaks a lot of the powerpc builds at the moment (see
> http://kisskb.ellerman.id.au/kisskb/branch/3/).

It should break anything that builds a non-debug XFS, not just powerpc.

> Or should I do my patch
> up and sent it?

No, the correct patch is below. Linus, can you please apply?

Cheers,

Dave.

---
Include linux/random.h in all builds, not just debug.


Signed-off-by: Dave Chinner <dgc@sgi.com>
---
 fs/xfs/linux-2.6/xfs_linux.h |    1 +
 fs/xfs/support/debug.h       |    2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

Index: 2.6.x-xfs-new/fs/xfs/linux-2.6/xfs_linux.h
===================================================================
--- 2.6.x-xfs-new.orig/fs/xfs/linux-2.6/xfs_linux.h	2008-04-22 15:06:11.000000000 +1000
+++ 2.6.x-xfs-new/fs/xfs/linux-2.6/xfs_linux.h	2008-04-30 16:38:38.754688626 +1000
@@ -75,6 +75,7 @@
 #include <linux/delay.h>
 #include <linux/log2.h>
 #include <linux/spinlock.h>
+#include <linux/random.h>
 
 #include <asm/page.h>
 #include <asm/div64.h>
Index: 2.6.x-xfs-new/fs/xfs/support/debug.h
===================================================================
--- 2.6.x-xfs-new.orig/fs/xfs/support/debug.h	2007-08-02 22:13:10.000000000 +1000
+++ 2.6.x-xfs-new/fs/xfs/support/debug.h	2008-04-30 16:38:43.518080606 +1000
@@ -49,8 +49,6 @@ extern void assfail(char *expr, char *f,
 
 #else /* DEBUG */
 
-#include <linux/random.h>
-
 #define ASSERT(expr)	\
 	(unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))