summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-08-31 12:55:23 +0200
committerJens Axboe <axboe@nelson.home.kernel.dk>2006-09-30 20:52:32 +0200
commit5e6d12b2c8be2cac099df6dcb8b26884f24d2621 (patch)
tree2ac881cd0670f0bd5bfa0438bc1570b169e7af3b /fs
parent65934a9a028b88e83e2b0f8b36618fe503349f8e (diff)
[PATCH] CONFIG_BLOCK internal.h cleanups
- forward declare struct superblock - use inlines, not macros Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
-rw-r--r--fs/internal.h17
1 files changed, 14 insertions, 3 deletions
diff --git a/fs/internal.h b/fs/internal.h
index f07147d63255..ea00126c9a59 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -11,6 +11,8 @@
#include <linux/ioctl32.h>
+struct super_block;
+
/*
* block_dev.c
*/
@@ -18,11 +20,20 @@
extern struct super_block *blockdev_superblock;
extern void __init bdev_cache_init(void);
-#define sb_is_blkdev_sb(sb) ((sb) == blockdev_superblock)
+static inline int sb_is_blkdev_sb(struct super_block *sb)
+{
+ return sb == blockdev_superblock;
+}
+
#else
-static inline void bdev_cache_init(void) {}
+static inline void bdev_cache_init(void)
+{
+}
-#define sb_is_blkdev_sb(sb) 0
+static inline int sb_is_blkdev_sb(struct super_block *sb)
+{
+ return 0;
+}
#endif
/*