summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-04-11 23:28:19 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-04-11 23:28:19 -0700
commitb566678f923387aa0cf3ec6d56ff368c3053ea0f (patch)
tree7ddb4d83675d8f76bcc6cfe06025553aafc950da /include
parent77ae13bcf65004e91631d76f7a4a8e3c8a41fba6 (diff)
[PATCH] reiserfs_kfree warning fix
fs/reiserfs/journal.c: In function `reiserfs_end_persistent_transaction': fs/reiserfs/journal.c:2616: warning: unused variable `s' Make the functions static inline so that typechecking is enabled if !CONFIG_REISERFS_CHECK.
Diffstat (limited to 'include')
-rw-r--r--include/linux/reiserfs_fs.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index 31e8047f0f41..dfb46b513712 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -2028,8 +2028,17 @@ extern struct address_space_operations reiserfs_address_space_operations ;
void * reiserfs_kmalloc (size_t size, int flags, struct super_block * s);
void reiserfs_kfree (const void * vp, size_t size, struct super_block * s);
#else
-#define reiserfs_kmalloc(x, y, z) kmalloc(x, y)
-#define reiserfs_kfree(x, y, z) kfree(x)
+static inline void *reiserfs_kmalloc(size_t size, int flags,
+ struct super_block *s)
+{
+ return kmalloc(size, flags);
+}
+
+static inline void reiserfs_kfree(const void *vp, size_t size,
+ struct super_block *s)
+{
+ kfree(vp);
+}
#endif
int fix_nodes (int n_op_mode, struct tree_balance * p_s_tb,