From d454cd69c6f8e8829273dffe1ccd952a7a7cbfa7 Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Mon, 31 Oct 2016 23:15:50 +0900 Subject: [PATCH] sys/vfs/hammer: Add HAMMER_VOL_JUNK_SIZE/HAMMER_{MIN,MAX}_VOL_JUNK No functional difference. Just rename HAMMER_VOL_ALLOC to HAMMER_VOL_JUNK_SIZE, as well as add HAMMER_{MIN,MAX}_VOL_JUNK macros for max/min header junk space which are all the same. --- sbin/newfs_hammer/newfs_hammer.c | 15 +++++++-------- sys/vfs/hammer/hammer_disk.h | 4 +++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/sbin/newfs_hammer/newfs_hammer.c b/sbin/newfs_hammer/newfs_hammer.c index 9cc94fb341..272c4ee6dc 100644 --- a/sbin/newfs_hammer/newfs_hammer.c +++ b/sbin/newfs_hammer/newfs_hammer.c @@ -76,7 +76,7 @@ main(int ac, char **av) * if it gets broken! */ assert(sizeof(struct hammer_volume_ondisk) <= HAMMER_BUFSIZE); - assert(sizeof(struct hammer_volume_ondisk) <= HAMMER_VOL_ALLOC); + assert(sizeof(struct hammer_volume_ondisk) <= HAMMER_MIN_VOL_JUNK); assert(sizeof(struct hammer_blockmap_layer1) == 32); assert(sizeof(struct hammer_blockmap_layer2) == 16); @@ -213,7 +213,7 @@ main(int ac, char **av) * volume header which is 1928 bytes. */ if (HeaderJunkSize == -1) - HeaderJunkSize = HAMMER_VOL_ALLOC; + HeaderJunkSize = HAMMER_VOL_JUNK_SIZE; else if (HeaderJunkSize < (int64_t)sizeof(struct hammer_volume_ondisk)) HeaderJunkSize = sizeof(struct hammer_volume_ondisk); HeaderJunkSize = (HeaderJunkSize + HAMMER_BUFMASK) & ~HAMMER_BUFMASK; @@ -292,20 +292,19 @@ usage(int exit_code) static void test_header_junk_size(int64_t size) { - if (size < HAMMER_VOL_ALLOC) { + if (size < HAMMER_MIN_VOL_JUNK) { if (ForceOpt == 0) { errx(1, "The minimum header junk size is %s", - sizetostr(HAMMER_VOL_ALLOC)); + sizetostr(HAMMER_MIN_VOL_JUNK)); } else { fprintf(stderr, "WARNING: you have specified " "header junk size less than %s.\n", - sizetostr(HAMMER_VOL_ALLOC)); + sizetostr(HAMMER_MIN_VOL_JUNK)); } - } else if (size > HAMMER_VOL_ALLOC) { - /* low limit equals high limit */ + } else if (size > HAMMER_MAX_VOL_JUNK) { errx(1, "The maximum header junk size is %s", - sizetostr(HAMMER_VOL_ALLOC)); + sizetostr(HAMMER_MAX_VOL_JUNK)); } } diff --git a/sys/vfs/hammer/hammer_disk.h b/sys/vfs/hammer/hammer_disk.h index f006cb2c8f..38333813e2 100644 --- a/sys/vfs/hammer/hammer_disk.h +++ b/sys/vfs/hammer/hammer_disk.h @@ -94,7 +94,9 @@ /* * Reserved space for (future) header junk after the volume header. */ -#define HAMMER_VOL_ALLOC (HAMMER_BUFSIZE * 16) +#define HAMMER_MIN_VOL_JUNK (HAMMER_BUFSIZE * 16) /* 256 KB */ +#define HAMMER_MAX_VOL_JUNK HAMMER_MIN_VOL_JUNK +#define HAMMER_VOL_JUNK_SIZE HAMMER_MIN_VOL_JUNK /* * Hammer transaction ids are 64 bit unsigned integers and are usually -- 2.41.0