minix: move globals and inline functions to minix_programs.h

Global variables and inline functions are moved from minix.h to
minix_programs.h which is included in mkfs.minix and fsck.minix.
The minix.h will have only struct definitions etc generic
contents which is reasonable to share with utilities and
libraries.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

4 files changed, 117 insertions, 2 deletions

diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index dc1b9c764..4816c1fb2 100644
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -15,8 +15,8 @@ dist_man_MANS = isosize.8 mkfs.8 mkswap.8 \
 
 sbin_PROGRAMS = mkfs mkswap fsck.minix mkfs.minix mkfs.bfs
 
-fsck_minix_SOURCES = fsck.minix.c $(top_srcdir)/lib/ismounted.c
-mkfs_minix_SOURCES = mkfs.minix.c mkfs.h $(utils_common) $(top_srcdir)/lib/strutils.c
+fsck_minix_SOURCES = fsck.minix.c minix_programs.h $(top_srcdir)/lib/ismounted.c
+mkfs_minix_SOURCES = mkfs.minix.c minix_programs.h mkfs.h $(utils_common) $(top_srcdir)/lib/strutils.c
 mkfs_bfs_SOURCES = mkfs.bfs.c $(utils_common)
 
 swaplabel_SOURCES = swaplabel.c $(utils_common)
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index abb4d9bf6..673dcd97b 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -103,6 +103,7 @@
 #include <signal.h>
 
 #include "minix.h"
+#include "minix_programs.h"
 #include "nls.h"
 #include "pathnames.h"
 #include "bitops.h"
diff --git a/disk-utils/minix_programs.h b/disk-utils/minix_programs.h
new file mode 100644
index 000000000..3e6c649ac
--- /dev/null
+++ b/disk-utils/minix_programs.h
@@ -0,0 +1,113 @@
+#ifndef UTIL_LINUX_MINIX_PROGRAMS_H
+#define UTIL_LINUX_MINIX_PROGRAMS_H
+
+#include "minix.h"
+
+/*
+ * Global variables.
+ */
+static int fs_version = 1;	/* this default value needs to change in a near future */
+
+static char *super_block_buffer;
+static char *inode_buffer = NULL;
+
+static char *inode_map;
+static char *zone_map;
+
+/*
+ * Inline functions.
+ */
+static inline unsigned long get_ninodes(void)
+{
+	switch (fs_version) {
+	case 3:
+		return Super3.s_ninodes;
+	default:
+		return (unsigned long)Super.s_ninodes;
+	}
+}
+
+static inline unsigned long get_nzones(void)
+{
+	switch (fs_version) {
+	case 3:
+		return (unsigned long)Super3.s_zones;
+	case 2:
+		return (unsigned long)Super.s_zones;
+	default:
+		return (unsigned long)Super.s_nzones;
+	}
+}
+
+static inline unsigned long get_nimaps(void)
+{
+	switch (fs_version) {
+	case 3:
+		return (unsigned long)Super3.s_imap_blocks;
+	default:
+		return (unsigned long)Super.s_imap_blocks;
+	}
+}
+
+static inline unsigned long get_nzmaps(void)
+{
+	switch (fs_version) {
+	case 3:
+		return (unsigned long)Super3.s_zmap_blocks;
+	default:
+		return (unsigned long)Super.s_zmap_blocks;
+	}
+}
+
+static inline unsigned long get_first_zone(void)
+{
+	switch (fs_version) {
+	case 3:
+		return (unsigned long)Super3.s_firstdatazone;
+	default:
+		return (unsigned long)Super.s_firstdatazone;
+	}
+}
+
+static inline unsigned long get_zone_size(void)
+{
+	switch (fs_version) {
+	case 3:
+		return (unsigned long)Super3.s_log_zone_size;
+	default:
+		return (unsigned long)Super.s_log_zone_size;
+	}
+}
+
+static inline unsigned long get_max_size(void)
+{
+	switch (fs_version) {
+	case 3:
+		return (unsigned long)Super3.s_max_size;
+	default:
+		return (unsigned long)Super.s_max_size;
+	}
+}
+
+static unsigned long inode_blocks(void)
+{
+	switch (fs_version) {
+	case 3:
+	case 2:
+		return UPPER(get_ninodes(), MINIX2_INODES_PER_BLOCK);
+	default:
+		return UPPER(get_ninodes(), MINIX_INODES_PER_BLOCK);
+	}
+}
+
+static inline unsigned long first_zone_data(void)
+{
+	return 2 + get_nimaps() + get_nzmaps() + inode_blocks();
+}
+
+static inline unsigned long get_inode_buffer_size(void)
+{
+	return inode_blocks() * MINIX_BLOCK_SIZE;
+}
+
+#endif				/* UTIL_LINUX_MINIX_PROGRAMS_H */
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index 489f032ac..8469d3df2 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -79,6 +79,7 @@
 
 #include "blkdev.h"
 #include "minix.h"
+#include "minix_programs.h"
 #include "nls.h"
 #include "pathnames.h"
 #include "bitops.h"