reiser4 compilation fix [ was: 2.6.14-rc2-mm2]

[Alexander Zarochentsev <zam@namesys.com>]

Hi,

On Friday 30 September 2005 01:37, Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.
>6.14-rc2-mm2/
>
> (temp copy at
> http://www.zip.com.au/~akpm/linux/patches/stuff/2.6.14-rc2-mm2.gz)
>
>
> - A bunch of memory management updates
>
> - The big pcmcia changes have been temporarily dropped
>
> - Multiple obscure tty drivers still won't compile
>
> - Lots of post-2.6.14-rc2-mm1 patches have been cheerfully tossed out
>   again due to various bugs, which felt nice.
>
> - I am offline until October 9.  Please send critical 2.6.14 fixes direct
> to Linus.
>

Andrew, please add this reiser4 compilation fix :
---------------------------------------------------
--- a/fs/reiser4/spin_macros.h
+++ b/fs/reiser4/spin_macros.h
@@ -82,8 +82,6 @@ typedef struct reiser4_rw_data {
 static inline void spin_ ## NAME ## _init(TYPE *x)				\
 {										\
 	__ODCA("nikita-2987", x != NULL);					\
-	cassert(sizeof(x->FIELD) != 0);						\
-	memset(& x->FIELD, 0, sizeof x->FIELD);					\
 	spin_lock_init(& x->FIELD.lock);					\
 }										\
 										\
@@ -236,7 +234,6 @@ typedef struct { int foo; } NAME ## _spi
 static inline void rw_ ## NAME ## _init(TYPE *x)				\
 {										\
 	__ODCA("nikita-2988", x != NULL);					\
-	memset(& x->FIELD, 0, sizeof x->FIELD);					\
 	rwlock_init(& x->FIELD.lock);						\
 }										\
 										\