Ext3 users - Nov 2001 - reiserfs and ext3 in 2.2.20

I am trying to compile 2.2.20 with both ext3 and reiserfs (to easily
migrate from reiserfs to ext3 :-)

All patches merge nicly, but compile fails because "buffer_journaled"
is defined by both reiserfs and ext3. I looked at the "2.2.14 ext3 +
reiserfs incompatibility"-thread on the kernel list and figured out
that renaming "buffer_journaled" in fs/buffer.c and include/linux/fs.h
to "buffer_journaled_ext" seems to works as someone mentioned, but
what I want to know is excatly how ugly that is.

-- 
There is no joy greater than soaring high on the wings of your dreams,
except maybe the joy of watching a dreamer who has nowhere to land but
in the ocean of reality

Audun Ytterdal wrote:
> 
> I am trying to compile 2.2.20 with both ext3 and reiserfs (to easily
> migrate from reiserfs to ext3 :-)
> 
> All patches merge nicly, but compile fails because
"buffer_journaled"
> is defined by both reiserfs and ext3. I looked at the "2.2.14 ext3 +
> reiserfs incompatibility"-thread on the kernel list and figured out
> that renaming "buffer_journaled" in fs/buffer.c and
include/linux/fs.h
> to "buffer_journaled_ext" seems to works as someone mentioned,
but
> what I want to know is excatly how ugly that is.
> 
No, that's fine.  In ext3-2.4 is was renamed to buffer_jbd.  Whatever.