2005-09-30 22:23:44

by Stephen Hemminger

[permalink] [raw]
Subject: Re: reiser4 compilation fix [ was: 2.6.14-rc2-mm2]


>
> 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); \
> } \
> \

These are just the kind of bogus macro's that block reiser4 from
getting merged.

--
Stephen Hemminger <[email protected]>
OSDL http://developer.osdl.org/~shemminger