summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-03-18 15:01:45 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-03-18 15:01:45 -0800
commitaee768e051f133d1d2e19be7cb0397ad7642be8a (patch)
treeca884a7a55677ec629c54a3d6f54e31ae3c12e69 /include/linux
parentf4358df8cbb7c0993a82db8617c82a6b14f9ca50 (diff)
[PATCH] reiserfs: use kernel min/max
From: "Randy.Dunlap" <rddunlap@osdl.org> From: Michael Veeck <michael.veeck@gmx.net> Remove unnecessary min/max macros and changes calls to use kernel.h macros instead.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/reiserfs_fs.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index 5525a2228a83..4e2b898a8d98 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -1944,11 +1944,10 @@ int reiserfs_global_version_in_proc( char *buffer, char **start, off_t offset,
#define PROC_EXP( e ) e
-#define MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
#define __PINFO( sb ) REISERFS_SB(sb) -> s_proc_info_data
#define PROC_INFO_MAX( sb, field, value ) \
__PINFO( sb ).field = \
- MAX( REISERFS_SB( sb ) -> s_proc_info_data.field, value )
+ max( REISERFS_SB( sb ) -> s_proc_info_data.field, value )
#define PROC_INFO_INC( sb, field ) ( ++ ( __PINFO( sb ).field ) )
#define PROC_INFO_ADD( sb, field, val ) ( __PINFO( sb ).field += ( val ) )
#define PROC_INFO_BH_STAT( sb, bh, level ) \