[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>

[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>
Andrew Morton · Jens Axboe
1 parent 65934a9a02
Showing 1 changed file with 14 additions and 3 deletions Side-by-side Diff
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
  
 /*
...	...	@@ -11,6 +11,8 @@
11	11
12	12	#include <linux/ioctl32.h>
13	13
	14	+struct super_block;
	15	+
14	16	/*
15	17	* block_dev.c
16	18	*/
17	19
18	20
...	...	@@ -18,11 +20,20 @@
18	20	extern struct super_block *blockdev_superblock;
19	21	extern void __init bdev_cache_init(void);
20	22
21		-#define sb_is_blkdev_sb(sb) ((sb) == blockdev_superblock)
	23	+static inline int sb_is_blkdev_sb(struct super_block *sb)
	24	+{
	25	+ return sb == blockdev_superblock;
	26	+}
	27	+
22	28	#else
23		-static inline void bdev_cache_init(void) {}
	29	+static inline void bdev_cache_init(void)
	30	+{
	31	+}
24	32
25		-#define sb_is_blkdev_sb(sb) 0
	33	+static inline int sb_is_blkdev_sb(struct super_block *sb)
	34	+{
	35	+ return 0;
	36	+}
26	37	#endif
27	38
28	39	/*