From 058cda4c1de90ca4fc3293a3bb5b859d87315d4d Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 21 Jul 2011 12:13:33 +0200 Subject: minix: cleanup global variables and macros Signed-off-by: Karel Zak --- disk-utils/minix_programs.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'disk-utils/minix_programs.h') diff --git a/disk-utils/minix_programs.h b/disk-utils/minix_programs.h index 3e6c649ac..4af1a3447 100644 --- a/disk-utils/minix_programs.h +++ b/disk-utils/minix_programs.h @@ -6,13 +6,18 @@ /* * Global variables. */ -static int fs_version = 1; /* this default value needs to change in a near future */ +extern int fs_version; +extern char *super_block_buffer; -static char *super_block_buffer; -static char *inode_buffer = NULL; +#define Super (*(struct minix_super_block *) super_block_buffer) +#define Super3 (*(struct minix3_super_block *) super_block_buffer) -static char *inode_map; -static char *zone_map; +#define INODE_SIZE (sizeof(struct minix_inode)) +#define INODE2_SIZE (sizeof(struct minix2_inode)) + +#define BITS_PER_BLOCK (MINIX_BLOCK_SIZE << 3) + +#define UPPER(size,n) ((size+((n)-1))/(n)) /* * Inline functions. -- cgit v1.2.3-55-g7522