From: Andrew Morton <akpm@osdl.org>
Date: Thu, 31 Aug 2006 10:55:23 +0000 (+0200)
Subject: [PATCH] CONFIG_BLOCK internal.h cleanups
X-Git-Tag: v2.6.19-rc1~640^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e6d12b2c8be2cac099df6dcb8b26884f24d2621;p=linux-2.6

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

diff --git a/fs/internal.h b/fs/internal.h
index f07147d632..ea00126c9a 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
 
 /*