On Mon 21-10-13 09:54:57, Michael Opdenacker wrote: > This patch removes a duplicate define in fs/reiserfs/reiserfs.h Hum, so the duplicate define certainly isn't nice but it's really a result of a namespace collision between return codes of two different (sets of) functions. So deleting the duplicate isn't really solving the problem, just hiding it. So I'd prefer more one of the following two solutions: 1) Just ignore the problem. Reiserfs is mostly dead and this isn't likely to cause any subtle issues. 2) Prefix the return codes somehow so that those two error namespaces don't clash. As a bonus you can convert defines to enums but I'm not sure that's worth the bother (prefixing is a simple search & replace so that should be trivial, well except for the CARRY_ON case). Honza > > Signed-off-by: Michael Opdenacker <michael.opdenacker@xxxxxxxxxxxxxxxxxx> > --- > fs/reiserfs/reiserfs.h | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h > index f8adaee..a27d69b 100644 > --- a/fs/reiserfs/reiserfs.h > +++ b/fs/reiserfs/reiserfs.h > @@ -597,7 +597,6 @@ void reiserfs_file_buffer(struct buffer_head *bh, int list); > extern struct file_system_type reiserfs_fs_type; > int reiserfs_resize(struct super_block *, unsigned long); > > -#define CARRY_ON 0 > #define SCHEDULE_OCCURRED 1 > > #define SB_BUFFER_WITH_SB(s) (REISERFS_SB(s)->s_sbh) > -- > 1.8.1.2 > -- Jan Kara <jack@xxxxxxx> SUSE Labs, CR -- To unsubscribe from this list: send the line "unsubscribe reiserfs-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
