PERFORCE change 164510 for review

[Aditya Sarawgi]

http://perforce.freebsd.org/chv.cgi?CH=164510

Change 164510 by truncs at aditya on 2009/06/16 16:04:30

	__KERNEL__ is used in linux to maintain the kernel namespace from the userland namespace. _KERNEL is used in FreeBSD for the same purpose.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#23 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#23 (text+ko) ====

@@ -132,18 +132,18 @@
 #define EXT2_MIN_BLOCK_SIZE		1024
 #define	EXT2_MAX_BLOCK_SIZE		4096
 #define EXT2_MIN_BLOCK_LOG_SIZE		  10
-#if defined(__KERNEL__) || defined(_KERNEL)
+#if defined(_KERNEL)
 # define EXT2_BLOCK_SIZE(s)		((s)->e2fs_bsize)
 #else
 # define EXT2_BLOCK_SIZE(s)		(EXT2_MIN_BLOCK_SIZE << (s)->e2fs_log_bsize)
 #endif
 #define	EXT2_ADDR_PER_BLOCK(s)		(EXT2_BLOCK_SIZE(s) / sizeof (__u32))
-#if defined(__KERNEL__) || defined(_KERNEL)
+#if defined(_KERNEL)
 # define EXT2_BLOCK_SIZE_BITS(s)	((s)->e2fs_blocksize_bits)
 #else
 # define EXT2_BLOCK_SIZE_BITS(s)	((s)->e2fs_log_bsize + 10)
 #endif
-#if defined(__KERNEL__) || defined(_KERNEL)
+#if defined(_KERNEL)
 #define	EXT2_ADDR_PER_BLOCK_BITS(s)	(EXT2_SB(s)->s_addr_per_block_bits)
 #define EXT2_INODE_SIZE(s)		(EXT2_SB(s)->e2fs_isize)
 #define EXT2_FIRST_INO(s)		(EXT2_SB(s)->e2fs_first_inode)
@@ -160,7 +160,7 @@
 #define EXT2_MIN_FRAG_SIZE		1024
 #define	EXT2_MAX_FRAG_SIZE		4096
 #define EXT2_MIN_FRAG_LOG_SIZE		  10
-#if defined(__KERNEL__) || defined(_KERNEL)
+#if defined(_KERNEL)
 # define EXT2_FRAG_SIZE(s)		(EXT2_SB(s)->e2fs_fsize)
 # define EXT2_FRAGS_PER_BLOCK(s)	(EXT2_SB(s)->e2fs_fpb)
 #else
@@ -185,7 +185,7 @@
 /*
  * Macro-instructions used to manage group descriptors
  */
-#if defined(__KERNEL__) || defined(_KERNEL)
+#if defined(_KERNEL)
 # define EXT2_BLOCKS_PER_GROUP(s)	(EXT2_SB(s)->e2fs_bpg)
 # define EXT2_DESC_PER_BLOCK(s)		(EXT2_SB(s)->e2fs_descpb)
 # define EXT2_DESC_PER_BLOCK_BITS(s)	(EXT2_SB(s)->s_desc_per_block_bits)