From owner-p4-projects@FreeBSD.ORG Tue Jun 16 16:04:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50AB3106567B; Tue, 16 Jun 2009 16:04:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E425C1065674 for ; Tue, 16 Jun 2009 16:04:46 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C9DFE8FC18 for ; Tue, 16 Jun 2009 16:04:46 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5GG4kKC097251 for ; Tue, 16 Jun 2009 16:04:46 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5GG4kAR097249 for perforce@freebsd.org; Tue, 16 Jun 2009 16:04:46 GMT (envelope-from truncs@FreeBSD.org) Date: Tue, 16 Jun 2009 16:04:46 GMT Message-Id: <200906161604.n5GG4kAR097249@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Cc: Subject: PERFORCE change 164510 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jun 2009 16:04:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=164510 Change 164510 by truncs@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)