small intermezzo cleanup
PATCH 1/1 small intermezzo cleanup
The patch below does the following cleanups in the intermezzo code:
- remove #include <stdarg.h>'s
- remove unused #define MIN/MAX/MKSTR
I've tested the compilation with 2.5.59.
Please apply
Adrian
fs/intermezzo/dir.c renamed from fs/intermezzo/dir.c.old +0 -2
@@ -22,8 +22,6 @@* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <stdarg.h> -#include <asm/bitops.h> #include <asm/ioctls.h> #include <asm/uaccess.h>
fs/intermezzo/fileset.c renamed from fs/intermezzo/fileset.c.old +0 -1
@@ -23,7 +23,6 @@*/ #define __NO_VERSION__ -#include <stdarg.h> #include <asm/bitops.h> #include <asm/uaccess.h>
fs/intermezzo/cache.c renamed from fs/intermezzo/cache.c.old +0 -1
@@ -22,7 +22,6 @@#define __NO_VERSION__#include <linux/module.h> -#include <stdarg.h> #include <asm/bitops.h> #include <asm/uaccess.h> #include <asm/system.h>
fs/intermezzo/replicator.c renamed from fs/intermezzo/replicator.c.old +0 -1
@@ -25,7 +25,6 @@#define __NO_VERSION__#include <linux/module.h> -#include <stdarg.h> #include <asm/uaccess.h> #include <linux/errno.h>
fs/intermezzo/file.c renamed from fs/intermezzo/file.c.old +0 -2
@@ -29,8 +29,6 @@* */ -#include <stdarg.h> -#include <asm/bitops.h> #include <asm/uaccess.h> #include <asm/system.h>
fs/intermezzo/methods.c renamed from fs/intermezzo/methods.c.old +0 -2
@@ -25,8 +25,6 @@* */ -#include <stdarg.h> -#include <asm/bitops.h> #include <asm/uaccess.h> #include <asm/system.h>
fs/intermezzo/super.c renamed from fs/intermezzo/super.c.old +0 -2
@@ -26,8 +26,6 @@ static char rcsid[] __attribute ((unused)) = "$Id: super.c,v 1.4 2002/10/12 02:16:19 rread Exp $";#define INTERMEZZO_VERSION "$Revision: 1.4 $" -#include <stdarg.h> -#include <asm/bitops.h> #include <asm/uaccess.h> #include <asm/system.h>
fs/intermezzo/intermezzo_lib.h renamed from fs/intermezzo/intermezzo_lib.h.old +0 -6
@@ -32,12 +32,6 @@# include <sys/types.h> #endif -#undef MIN -#define MIN (a,b) (((a)<(b)) ? (a): (b)) -#undef MAX -#define MAX (a,b) (((a)>(b)) ? (a): (b)) -#define MKSTR (ptr) ((ptr))? (ptr) : "" -static inline int size_round (int val) {return (val +3 ) & (~0x3 );