diff options
| -rw-r--r-- | sys/gnu/ext2fs/ext2_fs.h | 2 | ||||
| -rw-r--r-- | sys/gnu/ext2fs/ext2_linux_balloc.c | 8 | ||||
| -rw-r--r-- | sys/gnu/ext2fs/ext2_linux_ialloc.c | 4 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_fs.h | 2 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_linux_balloc.c | 8 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_linux_ialloc.c | 4 |
6 files changed, 18 insertions, 10 deletions
diff --git a/sys/gnu/ext2fs/ext2_fs.h b/sys/gnu/ext2fs/ext2_fs.h index 56a85756f75c..b3b5e1ee4b22 100644 --- a/sys/gnu/ext2fs/ext2_fs.h +++ b/sys/gnu/ext2fs/ext2_fs.h @@ -23,7 +23,7 @@ #include <sys/types.h> -#ifdef i386 +#ifdef __i386__ #if defined(__FreeBSD__) #include <machine/types.h> #else diff --git a/sys/gnu/ext2fs/ext2_linux_balloc.c b/sys/gnu/ext2fs/ext2_linux_balloc.c index 9bc80f893117..76836a6ae950 100644 --- a/sys/gnu/ext2fs/ext2_linux_balloc.c +++ b/sys/gnu/ext2fs/ext2_linux_balloc.c @@ -39,9 +39,8 @@ #include <gnu/ext2fs/ext2_fs.h> #include <gnu/ext2fs/ext2_fs_sb.h> #include <gnu/ext2fs/fs.h> -#include <sys/stat.h> -#ifdef i386 +#ifdef __i386__ #include <gnu/ext2fs/i386-bitops.h> #else #error Provide an bitops.h file, please ! @@ -448,6 +447,7 @@ got_block: return j; } +#ifdef unused static unsigned long ext2_count_free_blocks (struct mount * mp) { struct ext2_sb_info *sb = VFSTOUFS(mp)->um_e2fs; @@ -481,7 +481,7 @@ static unsigned long ext2_count_free_blocks (struct mount * mp) return sb->s_es->s_free_blocks_count; #endif } - +#endif /* unused */ static inline int block_in_use (unsigned long block, struct ext2_sb_info * sb, @@ -491,6 +491,7 @@ static inline int block_in_use (unsigned long block, EXT2_BLOCKS_PER_GROUP(sb), map); } +#ifdef unused static void ext2_check_blocks_bitmap (struct mount * mp) { struct ext2_sb_info *sb = VFSTOUFS(mp)->um_e2fs; @@ -556,6 +557,7 @@ static void ext2_check_blocks_bitmap (struct mount * mp) (unsigned long) es->s_free_blocks_count, bitmap_count); unlock_super (VFSTOUFS(mp)->um_devvp); } +#endif /* unused */ /* * this function is taken from diff --git a/sys/gnu/ext2fs/ext2_linux_ialloc.c b/sys/gnu/ext2fs/ext2_linux_ialloc.c index 263992a2c746..c20770bc733b 100644 --- a/sys/gnu/ext2fs/ext2_linux_ialloc.c +++ b/sys/gnu/ext2fs/ext2_linux_ialloc.c @@ -43,7 +43,7 @@ #include <gnu/ext2fs/fs.h> #include <sys/stat.h> -#if (i386) +#ifdef __i386__ #include <gnu/ext2fs/i386-bitops.h> #else #error please provide bit operation functions @@ -449,6 +449,7 @@ repeat: return j; } +#ifdef unused static unsigned long ext2_count_free_inodes (struct mount * mp) { #ifdef EXT2FS_DEBUG @@ -482,6 +483,7 @@ static unsigned long ext2_count_free_inodes (struct mount * mp) return VFSTOUFS(mp)->um_e2fsb->s_free_inodes_count; #endif } +#endif /* unused */ #ifdef LATER void ext2_check_inodes_bitmap (struct mount * mp) diff --git a/sys/gnu/fs/ext2fs/ext2_fs.h b/sys/gnu/fs/ext2fs/ext2_fs.h index 56a85756f75c..b3b5e1ee4b22 100644 --- a/sys/gnu/fs/ext2fs/ext2_fs.h +++ b/sys/gnu/fs/ext2fs/ext2_fs.h @@ -23,7 +23,7 @@ #include <sys/types.h> -#ifdef i386 +#ifdef __i386__ #if defined(__FreeBSD__) #include <machine/types.h> #else diff --git a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c index 9bc80f893117..76836a6ae950 100644 --- a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c +++ b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c @@ -39,9 +39,8 @@ #include <gnu/ext2fs/ext2_fs.h> #include <gnu/ext2fs/ext2_fs_sb.h> #include <gnu/ext2fs/fs.h> -#include <sys/stat.h> -#ifdef i386 +#ifdef __i386__ #include <gnu/ext2fs/i386-bitops.h> #else #error Provide an bitops.h file, please ! @@ -448,6 +447,7 @@ got_block: return j; } +#ifdef unused static unsigned long ext2_count_free_blocks (struct mount * mp) { struct ext2_sb_info *sb = VFSTOUFS(mp)->um_e2fs; @@ -481,7 +481,7 @@ static unsigned long ext2_count_free_blocks (struct mount * mp) return sb->s_es->s_free_blocks_count; #endif } - +#endif /* unused */ static inline int block_in_use (unsigned long block, struct ext2_sb_info * sb, @@ -491,6 +491,7 @@ static inline int block_in_use (unsigned long block, EXT2_BLOCKS_PER_GROUP(sb), map); } +#ifdef unused static void ext2_check_blocks_bitmap (struct mount * mp) { struct ext2_sb_info *sb = VFSTOUFS(mp)->um_e2fs; @@ -556,6 +557,7 @@ static void ext2_check_blocks_bitmap (struct mount * mp) (unsigned long) es->s_free_blocks_count, bitmap_count); unlock_super (VFSTOUFS(mp)->um_devvp); } +#endif /* unused */ /* * this function is taken from diff --git a/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c b/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c index 263992a2c746..c20770bc733b 100644 --- a/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c +++ b/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c @@ -43,7 +43,7 @@ #include <gnu/ext2fs/fs.h> #include <sys/stat.h> -#if (i386) +#ifdef __i386__ #include <gnu/ext2fs/i386-bitops.h> #else #error please provide bit operation functions @@ -449,6 +449,7 @@ repeat: return j; } +#ifdef unused static unsigned long ext2_count_free_inodes (struct mount * mp) { #ifdef EXT2FS_DEBUG @@ -482,6 +483,7 @@ static unsigned long ext2_count_free_inodes (struct mount * mp) return VFSTOUFS(mp)->um_e2fsb->s_free_inodes_count; #endif } +#endif /* unused */ #ifdef LATER void ext2_check_inodes_bitmap (struct mount * mp) |