From c17fa6008f08ddf6b8bd822f1e01bf7586f6cfba Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Wed, 12 Apr 2017 21:35:14 +0300 Subject: [PATCH] sbin/*hammer: Use typedef'd for struct buffer_info* This is a part of series of commits started from 21e9e7d5ff in 2016. This is for userspace. --- sbin/hammer/blockmap.c | 14 ++++++------ sbin/hammer/cache.c | 2 +- sbin/hammer/cmd_blockmap.c | 10 ++++----- sbin/hammer/cmd_recover.c | 12 +++++----- sbin/hammer/cmd_show.c | 14 ++++++------ sbin/hammer/cmd_strip.c | 6 ++--- sbin/hammer/hammer_util.h | 16 +++++++------- sbin/hammer/ondisk.c | 47 ++++++++++++++++++++-------------------- sbin/newfs_hammer/newfs_hammer.c | 6 ++--- 9 files changed, 63 insertions(+), 64 deletions(-) diff --git a/sbin/hammer/blockmap.c b/sbin/hammer/blockmap.c index 553e5c3f81..7f4ccf4dd7 100644 --- a/sbin/hammer/blockmap.c +++ b/sbin/hammer/blockmap.c @@ -60,8 +60,8 @@ hammer_off_t alloc_undo_bigblock(volume_info_t volume) { hammer_blockmap_t freemap; - struct buffer_info *buffer1 = NULL; - struct buffer_info *buffer2 = NULL; + buffer_info_t buffer1 = NULL; + buffer_info_t buffer2 = NULL; hammer_blockmap_layer1_t layer1; hammer_blockmap_layer2_t layer2; hammer_off_t layer1_offset; @@ -112,13 +112,13 @@ alloc_undo_bigblock(volume_info_t volume) */ void * alloc_blockmap(int zone, int bytes, hammer_off_t *result_offp, - struct buffer_info **bufferp) + buffer_info_t *bufferp) { volume_info_t volume; hammer_blockmap_t blockmap; hammer_blockmap_t freemap; - struct buffer_info *buffer1 = NULL; - struct buffer_info *buffer2 = NULL; + buffer_info_t buffer1 = NULL; + buffer_info_t buffer2 = NULL; hammer_blockmap_layer1_t layer1; hammer_blockmap_layer2_t layer2; hammer_off_t tmp_offset; @@ -224,8 +224,8 @@ blockmap_lookup_save(hammer_off_t zone_offset, hammer_blockmap_t freemap; hammer_blockmap_layer1_t layer1; hammer_blockmap_layer2_t layer2; - struct buffer_info *buffer1 = NULL; - struct buffer_info *buffer2 = NULL; + buffer_info_t buffer1 = NULL; + buffer_info_t buffer2 = NULL; hammer_off_t layer1_offset; hammer_off_t layer2_offset; hammer_off_t result_offset = HAMMER_OFF_BAD;; diff --git a/sbin/hammer/cache.c b/sbin/hammer/cache.c index 003fd21bc0..2ac266bb90 100644 --- a/sbin/hammer/cache.c +++ b/sbin/hammer/cache.c @@ -128,7 +128,7 @@ hammer_cache_flush(void) cache->refs = 1; cache->delete = 1; - rel_buffer((struct buffer_info*)cache); + rel_buffer((buffer_info_t)cache); if (CacheUse < CacheMax / 2) break; diff --git a/sbin/hammer/cmd_blockmap.c b/sbin/hammer/cmd_blockmap.c index 78ca7c393e..cddab1fc3a 100644 --- a/sbin/hammer/cmd_blockmap.c +++ b/sbin/hammer/cmd_blockmap.c @@ -101,8 +101,8 @@ dump_blockmap(int zone) hammer_blockmap_t rootmap; hammer_blockmap_layer1_t layer1; hammer_blockmap_layer2_t layer2; - struct buffer_info *buffer1 = NULL; - struct buffer_info *buffer2 = NULL; + buffer_info_t buffer1 = NULL; + buffer_info_t buffer2 = NULL; hammer_off_t layer1_offset; hammer_off_t layer2_offset; hammer_off_t phys_offset; @@ -254,7 +254,7 @@ static void check_freemap(hammer_blockmap_t freemap) { hammer_off_t offset; - struct buffer_info *buffer1 = NULL; + buffer_info_t buffer1 = NULL; hammer_blockmap_layer1_t layer1; int i; @@ -272,7 +272,7 @@ check_freemap(hammer_blockmap_t freemap) static void check_btree_node(hammer_off_t node_offset, int depth) { - struct buffer_info *buffer = NULL; + buffer_info_t buffer = NULL; hammer_node_ondisk_t node; hammer_btree_elm_t elm; int i; @@ -334,7 +334,7 @@ check_btree_node(hammer_off_t node_offset, int depth) static void check_undo(hammer_blockmap_t undomap) { - struct buffer_info *buffer = NULL; + buffer_info_t buffer = NULL; hammer_off_t scan_offset; hammer_fifo_head_t head; diff --git a/sbin/hammer/cmd_recover.c b/sbin/hammer/cmd_recover.c index ddae01e57d..a71334d2d3 100644 --- a/sbin/hammer/cmd_recover.c +++ b/sbin/hammer/cmd_recover.c @@ -121,7 +121,7 @@ RB_GENERATE2(bigblock_rb_tree, bigblock, entry, bigblock_cmp, hammer_off_t, void hammer_cmd_recover(char **av, int ac) { - struct buffer_info *data_buffer; + buffer_info_t data_buffer; volume_info_t volume; bigblock_t b = NULL; hammer_off_t off; @@ -311,7 +311,7 @@ recover_top(char *ptr, hammer_off_t offset) static void recover_elm(hammer_btree_leaf_elm_t leaf) { - struct buffer_info *data_buffer = NULL; + buffer_info_t data_buffer = NULL; struct recover_dict *dict; struct recover_dict *dict2; hammer_data_ondisk_t ondisk; @@ -755,8 +755,8 @@ scan_raw_limit(void) hammer_blockmap_t rootmap; hammer_blockmap_layer1_t layer1; hammer_blockmap_layer2_t layer2; - struct buffer_info *buffer1 = NULL; - struct buffer_info *buffer2 = NULL; + buffer_info_t buffer1 = NULL; + buffer_info_t buffer2 = NULL; hammer_off_t layer1_offset; hammer_off_t layer2_offset; hammer_off_t phys_offset; @@ -821,8 +821,8 @@ scan_bigblocks(int target_zone) hammer_blockmap_t rootmap; hammer_blockmap_layer1_t layer1; hammer_blockmap_layer2_t layer2; - struct buffer_info *buffer1 = NULL; - struct buffer_info *buffer2 = NULL; + buffer_info_t buffer1 = NULL; + buffer_info_t buffer2 = NULL; hammer_off_t layer1_offset; hammer_off_t layer2_offset; hammer_off_t phys_offset; diff --git a/sbin/hammer/cmd_show.c b/sbin/hammer/cmd_show.c index ad2ee4190e..83246fde9b 100644 --- a/sbin/hammer/cmd_show.c +++ b/sbin/hammer/cmd_show.c @@ -174,7 +174,7 @@ static void print_btree_node(hammer_off_t node_offset, hammer_tid_t mirror_tid, hammer_btree_elm_t lbe) { - struct buffer_info *buffer = NULL; + buffer_info_t buffer = NULL; hammer_node_ondisk_t node; hammer_btree_elm_t elm; int i; @@ -270,7 +270,7 @@ static int test_node_count(hammer_node_ondisk_t node, char *badmp) { hammer_node_ondisk_t parent_node; - struct buffer_info *buffer = NULL; + buffer_info_t buffer = NULL; int maxcount; maxcount = hammer_node_max_elements(node->type); @@ -463,7 +463,7 @@ get_elm_flags(hammer_node_ondisk_t node, hammer_off_t node_offset, if (child_offset == 0) { flags |= FLAG_BADCHILDPARENT; } else { - struct buffer_info *buffer = NULL; + buffer_info_t buffer = NULL; hammer_node_ondisk_t subnode; subnode = get_buffer_data(child_offset, &buffer, 0); if (subnode == NULL) @@ -621,7 +621,7 @@ static const char * check_data_crc(hammer_btree_elm_t elm, const char **whichp) { - struct buffer_info *data_buffer; + buffer_info_t data_buffer; hammer_off_t data_offset; int32_t data_len; uint32_t crc; @@ -661,7 +661,7 @@ uint32_t get_buf_crc(hammer_off_t buf_offset, int32_t buf_len, uint32_t leaf_crc, const char **whichp) { - struct buffer_info *data_buffer = NULL; + buffer_info_t data_buffer = NULL; int32_t len; uint32_t crc = 0; uint32_t ncrc = 0; @@ -750,7 +750,7 @@ static void print_record(hammer_btree_elm_t elm) { - struct buffer_info *data_buffer; + buffer_info_t data_buffer; hammer_off_t data_offset; int32_t data_len; hammer_data_ondisk_t data; @@ -1038,7 +1038,7 @@ hammer_cmd_show_undo(void) hammer_off_t scan_offset; hammer_fifo_any_t head; hammer_fifo_head_t hdr; - struct buffer_info *data_buffer = NULL; + buffer_info_t data_buffer = NULL; struct zone_stat *stats = NULL; volume = get_root_volume(); diff --git a/sbin/hammer/cmd_strip.c b/sbin/hammer/cmd_strip.c index 0ba8233e0c..6787561a55 100644 --- a/sbin/hammer/cmd_strip.c +++ b/sbin/hammer/cmd_strip.c @@ -44,8 +44,8 @@ hammer_cmd_strip(void) hammer_blockmap_t rootmap; hammer_blockmap_layer1_t layer1; hammer_blockmap_layer2_t layer2; - struct buffer_info *buffer1 = NULL; - struct buffer_info *buffer2 = NULL; + buffer_info_t buffer1 = NULL; + buffer_info_t buffer2 = NULL; hammer_off_t layer1_offset; hammer_off_t layer2_offset; hammer_off_t phys_offset; @@ -114,7 +114,7 @@ hammer_cmd_strip(void) static void hammer_strip_bigblock(int zone, hammer_off_t offset) { - struct buffer_info *buffer = NULL; + buffer_info_t buffer = NULL; int i; assert(hammer_is_index_record(zone)); diff --git a/sbin/hammer/hammer_util.h b/sbin/hammer/hammer_util.h index 5a03e67a3d..389654b49e 100644 --- a/sbin/hammer/hammer_util.h +++ b/sbin/hammer/hammer_util.h @@ -93,14 +93,14 @@ struct cache_info { int delete; /* delete flag - delete on last ref */ }; -struct buffer_info { +typedef struct buffer_info { struct cache_info cache; /* must be at offset 0 */ TAILQ_ENTRY(buffer_info) entry; hammer_off_t zone2_offset; /* zone-2 offset */ int64_t raw_offset; /* physical offset */ volume_info_t volume; void *ondisk; -}; +} *buffer_info_t; /* * Data structure for zone statistics. @@ -125,13 +125,13 @@ int is_regfile(volume_info_t volume); void assert_volume_offset(volume_info_t volume); volume_info_t get_volume(int32_t vol_no); volume_info_t get_root_volume(void); -void rel_buffer(struct buffer_info *buffer); -void *get_buffer_data(hammer_off_t buf_offset, struct buffer_info **bufferp, +void rel_buffer(buffer_info_t buffer); +void *get_buffer_data(hammer_off_t buf_offset, buffer_info_t *bufferp, int isnew); hammer_node_ondisk_t alloc_btree_node(hammer_off_t *offp, - struct buffer_info **data_bufferp); + buffer_info_t *data_bufferp); void *alloc_meta_element(hammer_off_t *offp, int32_t data_len, - struct buffer_info **data_bufferp); + buffer_info_t *data_bufferp); void format_blockmap(volume_info_t root_vol, int zone, hammer_off_t offset); void format_freemap(volume_info_t root_vol); int64_t initialize_freemap(volume_info_t volume); @@ -140,14 +140,14 @@ void format_undomap(volume_info_t root_vol, int64_t *undo_buffer_size); void print_blockmap(const volume_info_t volume); void flush_all_volumes(void); void flush_volume(volume_info_t volume); -void flush_buffer(struct buffer_info *buffer); +void flush_buffer(buffer_info_t buffer); int64_t init_boot_area_size(int64_t value, off_t avg_vol_size); int64_t init_memory_log_size(int64_t value, off_t avg_vol_size); hammer_off_t bootstrap_bigblock(volume_info_t volume); hammer_off_t alloc_undo_bigblock(volume_info_t volume); void *alloc_blockmap(int zone, int bytes, hammer_off_t *result_offp, - struct buffer_info **bufferp); + buffer_info_t *bufferp); hammer_off_t blockmap_lookup(hammer_off_t bmap_off, int *errorp); hammer_off_t blockmap_lookup_save(hammer_off_t bmap_off, hammer_blockmap_layer1_t layer1, diff --git a/sbin/hammer/ondisk.c b/sbin/hammer/ondisk.c index a34371a269..28f59afb62 100644 --- a/sbin/hammer/ondisk.c +++ b/sbin/hammer/ondisk.c @@ -38,11 +38,11 @@ #include "hammer_util.h" static void check_volume(volume_info_t volume); -static void get_buffer_readahead(struct buffer_info *base); +static void get_buffer_readahead(buffer_info_t base); static __inline int readhammervol(volume_info_t volume); -static __inline int readhammerbuf(struct buffer_info *buffer); +static __inline int readhammerbuf(buffer_info_t buffer); static __inline int writehammervol(volume_info_t volume); -static __inline int writehammerbuf(struct buffer_info *buffer); +static __inline int writehammerbuf(buffer_info_t buffer); uuid_t Hammer_FSType; uuid_t Hammer_FSId; @@ -65,11 +65,11 @@ buffer_hash(hammer_off_t zone2_offset) return(hi); } -static struct buffer_info* +static buffer_info_t find_buffer(hammer_off_t zone2_offset) { volume_info_t volume; - struct buffer_info *buffer; + buffer_info_t buffer; int hi; volume = get_volume(HAMMER_VOL_DECODE(zone2_offset)); @@ -316,11 +316,11 @@ __blockmap_xlate_to_zone2(hammer_off_t buf_offset) return(zone2_offset); } -static struct buffer_info * +static buffer_info_t __alloc_buffer(hammer_off_t zone2_offset, int isnew) { volume_info_t volume; - struct buffer_info *buffer; + buffer_info_t buffer; int hi; volume = get_volume(HAMMER_VOL_DECODE(zone2_offset)); @@ -352,10 +352,10 @@ __alloc_buffer(hammer_off_t zone2_offset, int isnew) /* * Acquire the 16KB buffer for specified zone offset. */ -static struct buffer_info * +static buffer_info_t get_buffer(hammer_off_t buf_offset, int isnew) { - struct buffer_info *buffer; + buffer_info_t buffer; hammer_off_t zone2_offset; int dora = 0; @@ -389,9 +389,9 @@ get_buffer(hammer_off_t buf_offset, int isnew) } static void -get_buffer_readahead(struct buffer_info *base) +get_buffer_readahead(buffer_info_t base) { - struct buffer_info *buffer; + buffer_info_t buffer; volume_info_t volume; hammer_off_t zone2_offset; int64_t raw_offset; @@ -423,7 +423,7 @@ get_buffer_readahead(struct buffer_info *base) } void -rel_buffer(struct buffer_info *buffer) +rel_buffer(buffer_info_t buffer) { volume_info_t volume; int hi; @@ -451,8 +451,7 @@ rel_buffer(struct buffer_info *buffer) * If bufferp is freed a referenced buffer is loaded into it. */ void * -get_buffer_data(hammer_off_t buf_offset, struct buffer_info **bufferp, - int isnew) +get_buffer_data(hammer_off_t buf_offset, buffer_info_t *bufferp, int isnew) { hammer_off_t xor; @@ -480,7 +479,7 @@ get_buffer_data(hammer_off_t buf_offset, struct buffer_info **bufferp, * Allocate HAMMER elements - B-Tree nodes */ hammer_node_ondisk_t -alloc_btree_node(hammer_off_t *offp, struct buffer_info **data_bufferp) +alloc_btree_node(hammer_off_t *offp, buffer_info_t *data_bufferp) { hammer_node_ondisk_t node; @@ -495,7 +494,7 @@ alloc_btree_node(hammer_off_t *offp, struct buffer_info **data_bufferp) */ void * alloc_meta_element(hammer_off_t *offp, int32_t data_len, - struct buffer_info **data_bufferp) + buffer_info_t *data_bufferp) { void *data; @@ -538,7 +537,7 @@ format_blockmap(volume_info_t root_vol, int zone, hammer_off_t offset) void format_freemap(volume_info_t root_vol) { - struct buffer_info *buffer = NULL; + buffer_info_t buffer = NULL; hammer_off_t layer1_offset; hammer_blockmap_t blockmap; hammer_blockmap_layer1_t layer1; @@ -577,8 +576,8 @@ int64_t initialize_freemap(volume_info_t volume) { volume_info_t root_vol; - struct buffer_info *buffer1 = NULL; - struct buffer_info *buffer2 = NULL; + buffer_info_t buffer1 = NULL; + buffer_info_t buffer2 = NULL; hammer_blockmap_layer1_t layer1; hammer_blockmap_layer2_t layer2; hammer_off_t layer1_offset; @@ -718,7 +717,7 @@ format_undomap(volume_info_t root_vol, int64_t *undo_buffer_size) hammer_off_t undo_limit; hammer_blockmap_t blockmap; hammer_volume_ondisk_t ondisk; - struct buffer_info *buffer = NULL; + buffer_info_t buffer = NULL; hammer_off_t scan; int n; int limit_index; @@ -882,7 +881,7 @@ flush_all_volumes(void) void flush_volume(volume_info_t volume) { - struct buffer_info *buffer; + buffer_info_t buffer; int i; for (i = 0; i < HAMMER_BUFLISTS; ++i) { @@ -896,7 +895,7 @@ flush_volume(volume_info_t volume) } void -flush_buffer(struct buffer_info *buffer) +flush_buffer(buffer_info_t buffer) { volume_info_t volume; @@ -929,7 +928,7 @@ readhammervol(volume_info_t volume) } static __inline int -readhammerbuf(struct buffer_info *buffer) +readhammerbuf(buffer_info_t buffer) { return(__read(buffer->volume, buffer->ondisk, buffer->raw_offset, HAMMER_BUFSIZE)); @@ -956,7 +955,7 @@ writehammervol(volume_info_t volume) } static __inline int -writehammerbuf(struct buffer_info *buffer) +writehammerbuf(buffer_info_t buffer) { return(__write(buffer->volume, buffer->ondisk, buffer->raw_offset, HAMMER_BUFSIZE)); diff --git a/sbin/newfs_hammer/newfs_hammer.c b/sbin/newfs_hammer/newfs_hammer.c index 8b423d7cc6..13f2cced26 100644 --- a/sbin/newfs_hammer/newfs_hammer.c +++ b/sbin/newfs_hammer/newfs_hammer.c @@ -668,9 +668,9 @@ format_root_directory(const char *label) hammer_node_ondisk_t bnode; hammer_inode_data_t idata; hammer_pseudofs_data_t pfsd; - struct buffer_info *data_buffer0 = NULL; - struct buffer_info *data_buffer1 = NULL; - struct buffer_info *data_buffer2 = NULL; + buffer_info_t data_buffer0 = NULL; + buffer_info_t data_buffer1 = NULL; + buffer_info_t data_buffer2 = NULL; hammer_btree_elm_t elm; uint64_t xtime; -- 2.11.4.GIT