Skip to contentSkip to conversation

remove unionfs reference to SLAB_CTOR_VERIFY

PATCH In review Lee Schermerhorn 2 participants 3 messages May 7, 2007

lore
Share & tools
lore

Lee Schermerhorn

author
#0 lore raw

PATCH 1/1 remove unionfs reference to SLAB_CTOR_VERIFY

With unionfs included as a module, 2.6.21-mm1 build broke with:

fs/unionfs/super.c: In function ‘init_once’:
fs/unionfs/super.c:822: error: ‘SLAB_CTOR_VERIFY’ undeclared (first use in this function)
fs/unionfs/super.c:822: error: (Each undeclared identifier is reported only oncefs/unionfs/super.c:822: error: for each function it appears in.)

Looks like it missed the removal of SLAB_CTOR_VERIFY.

This patch matches how the situation was addressed elsewhere throughout the kernel. Fixes the problem for me...

Signed-off-by Lee Schermerhorn <[email protected]>
 fs/unionfs/super.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
fs/unionfs/super.c +1 -2
Index: Linux/fs/unionfs/super.c
===================================================================
@@ -819,8 +819,7 @@ static void init_once(void *v, struct km
 {
 	struct unionfs_inode_info *i = v;
 
-	if ((flags & (SLAB_CTOR_VERIFY | SLAB_CTOR_CONSTRUCTOR)) ==
-	    SLAB_CTOR_CONSTRUCTOR)
+	if (flags & SLAB_CTOR_CONSTRUCTOR)
 		inode_init_once(&i->vfs_inode);
 }
#1 lore raw
Quoted 7 lines · Lee Schermerhorn

With unionfs included as a module, 2.6.21-mm1 build broke with:

fs/unionfs/super.c: In function ‘init_once’:
fs/unionfs/super.c:822: error: ‘SLAB_CTOR_VERIFY’ undeclared (first use in this function)
fs/unionfs/super.c:822: error: (Each undeclared identifier is reported only oncefs/unionfs/super.c:822: error: for each function it appears in.)

Looks like it missed the removal of SLAB_CTOR_VERIFY.

This fix (by Adrian Bunk) is already in the unionfs git tree.

Thanks anyway.

Josef "Jeff" Sipek.

Signature · 4 lines
Debugging is twice as hard as writing the code in the first place.
Therefore, if you write the code as cleverly as possible, you are, by
definition, not smart enough to debug it.
		- Brian W. Kernighan
author
#2 lore raw
Quoted 7 lines · Josef Sipek
Quoted 6 lines · Lee Schermerhorn

With unionfs included as a module, 2.6.21-mm1 build broke with:

fs/unionfs/super.c: In function ‘init_once’:
fs/unionfs/super.c:822: error: ‘SLAB_CTOR_VERIFY’ undeclared (first use in this function)
fs/unionfs/super.c:822: error: (Each undeclared identifier is reported only oncefs/unionfs/super.c:822: error: for each function it appears in.)

Quoted 5 lines
Quoted 1 line

Looks like it missed the removal of SLAB_CTOR_VERIFY.

This fix (by Adrian Bunk) is already in the unionfs git tree.

Thanks anyway.

OK. I just ran into the issue this am with 21-mm1. I didn't see the fix in the MARC archives, but they haven't been updated since ~3may. Sorry for the noise...

Lee