diff --git a/[refs] b/[refs]
index 6b3e47c9efd1..dc764d9d53a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65934a9a028b88e83e2b0f8b36618fe503349f8e
+refs/heads/master: 5e6d12b2c8be2cac099df6dcb8b26884f24d2621
diff --git a/trunk/fs/internal.h b/trunk/fs/internal.h
index f07147d63255..ea00126c9a59 100644
--- a/trunk/fs/internal.h
+++ b/trunk/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
 
 /*