diff options
author | Sami Kerola | 2011-07-20 20:13:08 +0200 |
---|---|---|
committer | Sami Kerola | 2011-07-20 20:13:08 +0200 |
commit | 63883af765609743b7031faa4f33d6e2a0b2b156 (patch) | |
tree | ee15005a53424aa9734c13f93d5c289dd75cf58f /include/minix.h | |
parent | libblkid: use superblock structure from minix.h (diff) | |
download | kernel-qcow2-util-linux-63883af765609743b7031faa4f33d6e2a0b2b156.tar.gz kernel-qcow2-util-linux-63883af765609743b7031faa4f33d6e2a0b2b156.tar.xz kernel-qcow2-util-linux-63883af765609743b7031faa4f33d6e2a0b2b156.zip |
libblkid: use MINIX_BLOCK_SIZE from minix.h
In the minix.h two definitions where renamed, so that the single
definition is reusable in fsck.minix, mkfs.minix and libblkid.
BLOCK_SIZE_BITS -> MINIX_BLOCK_SIZE_BITS
BLOCK_SIZE -> MINIX_BLOCK_SIZE
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'include/minix.h')
-rw-r--r-- | include/minix.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/minix.h b/include/minix.h index 4975c6598..7ef6eecb0 100644 --- a/include/minix.h +++ b/include/minix.h @@ -55,14 +55,14 @@ struct minix3_super_block { uint8_t s_disk_version; }; -#define BLOCK_SIZE_BITS 10 -#define BLOCK_SIZE (1<<BLOCK_SIZE_BITS) +#define MINIX_BLOCK_SIZE_BITS 10 +#define MINIX_BLOCK_SIZE (1<<MINIX_BLOCK_SIZE_BITS) #define NAME_MAX 255 /* # chars in a file name */ #define MAX_INODES 65535 -#define MINIX_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix_inode))) -#define MINIX2_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix2_inode))) +#define MINIX_INODES_PER_BLOCK ((MINIX_BLOCK_SIZE)/(sizeof (struct minix_inode))) +#define MINIX2_INODES_PER_BLOCK ((MINIX_BLOCK_SIZE)/(sizeof (struct minix2_inode))) #define MINIX_VALID_FS 0x0001 /* Clean fs. */ #define MINIX_ERROR_FS 0x0002 /* fs has errors. */ @@ -85,7 +85,7 @@ char *super_block_buffer, *inode_buffer = NULL; static char *inode_map; static char *zone_map; -#define BITS_PER_BLOCK (BLOCK_SIZE<<3) +#define BITS_PER_BLOCK (MINIX_BLOCK_SIZE<<3) #define UPPER(size,n) ((size+((n)-1))/(n)) @@ -185,7 +185,7 @@ static inline unsigned long first_zone_data(void) static inline unsigned long get_inode_buffer_size(void) { - return inode_blocks() * BLOCK_SIZE; + return inode_blocks() * MINIX_BLOCK_SIZE; } #endif /* UTIL_LINUX_MINIX_H */ |