Rusty Lynch
2004-Mar-04 14:35 UTC
[Ocfs2-devel] [PATCH]remove mark_info_dirty() hack on 2.6
In ocfs.h we have a hack for avoiding warnings by defining mark_info_dirty(). This is no longer needed in 2.6, and there is a patch in the -mm tree that is about to make it into the mainline tree that changes the mark_info_dirty() prototype. The following patch changes ocfs.h to only include the warning work around if compiling against a 2.4 kernel. --rusty Index: src/inc/ocfs.h ==================================================================--- src/inc/ocfs.h (revision 754) +++ src/inc/ocfs.h (working copy) @@ -27,10 +27,6 @@ #ifndef OCFS_H #define OCFS_H -/* XXX Hack to avoid warning */ -struct mem_dqinfo; -extern inline void mark_info_dirty(struct mem_dqinfo *info); - /* ** System header files */ @@ -49,6 +45,10 @@ #endif extern inline int generic_fls(int x); extern inline int get_bitmask_order(unsigned int count); + +/* XXX Hack to avoid warning */ +struct mem_dqinfo; +extern inline void mark_info_dirty(struct mem_dqinfo *info); #endif /* 2.4 kernel */ #include <linux/module.h>