From 1ba4249f8f732d0a963a13b94b8164b6eb55809a Mon Sep 17 00:00:00 2001
From: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Date: Mon, 26 Sep 2016 09:51:45 +0900
Subject: [PATCH] sbin/hammer: Remove get_node()

Just call get_data_buffer(offset, &buffer, 0) like other data do.
---
 sbin/hammer/cmd_blockmap.c |  2 +-
 sbin/hammer/cmd_show.c     |  6 +++---
 sbin/hammer/hammer_util.h  |  3 ---
 sbin/hammer/ondisk.c       | 10 ----------
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/sbin/hammer/cmd_blockmap.c b/sbin/hammer/cmd_blockmap.c
index 4de2317a68..119c6c073c 100644
--- a/sbin/hammer/cmd_blockmap.c
+++ b/sbin/hammer/cmd_blockmap.c
@@ -283,7 +283,7 @@ check_btree_node(hammer_off_t node_offset, int depth)
 
 	if (depth == 0)
 		collect_btree_root(node_offset);
-	node = get_node(node_offset, &buffer);
+	node = get_buffer_data(node_offset, &buffer, 0);
 
 	if (node == NULL) {
 		badc = 'B';
diff --git a/sbin/hammer/cmd_show.c b/sbin/hammer/cmd_show.c
index 59c29aa745..e5593afb57 100644
--- a/sbin/hammer/cmd_show.c
+++ b/sbin/hammer/cmd_show.c
@@ -195,7 +195,7 @@ print_btree_node(hammer_off_t node_offset,
 	const char *ext;
 
 	depth++;
-	node = get_node(node_offset, &buffer);
+	node = get_buffer_data(node_offset, &buffer, 0);
 
 	if (node == NULL) {
 		badc = 'B';
@@ -296,7 +296,7 @@ test_node_count(hammer_node_ondisk_t node, char *badmp)
 		*badmp = 'C';
 		return(-1);
 	} else if (node->count == 0) {
-		parent_node = get_node(node->parent, &buffer);
+		parent_node = get_buffer_data(node->parent, &buffer, 0);
 		if (parent_node->count != 1) {
 			*badmp = 'C';
 			rel_buffer(buffer);
@@ -483,7 +483,7 @@ get_elm_flags(hammer_node_ondisk_t node, hammer_off_t node_offset,
 			} else {
 				struct buffer_info *buffer = NULL;
 				hammer_node_ondisk_t subnode;
-				subnode = get_node(child_offset, &buffer);
+				subnode = get_buffer_data(child_offset, &buffer, 0);
 				if (subnode == NULL)
 					flags |= FLAG_BADCHILDPARENT;
 				else if (subnode->parent != node_offset)
diff --git a/sbin/hammer/hammer_util.h b/sbin/hammer/hammer_util.h
index b0c7d6ead7..11759d8f07 100644
--- a/sbin/hammer/hammer_util.h
+++ b/sbin/hammer/hammer_util.h
@@ -126,9 +126,6 @@ struct volume_info *get_volume(int32_t vol_no);
 struct volume_info *get_root_volume(void);
 void *get_buffer_data(hammer_off_t buf_offset, struct buffer_info **bufferp,
 				int isnew);
-hammer_node_ondisk_t get_node(hammer_off_t node_offset,
-				struct buffer_info **bufp);
-
 void rel_buffer(struct buffer_info *buffer);
 
 hammer_off_t alloc_bigblock(struct volume_info *volume, int zone);
diff --git a/sbin/hammer/ondisk.c b/sbin/hammer/ondisk.c
index df6a1b9f9d..848f6a5d0d 100644
--- a/sbin/hammer/ondisk.c
+++ b/sbin/hammer/ondisk.c
@@ -413,16 +413,6 @@ get_buffer_data(hammer_off_t buf_offset, struct buffer_info **bufferp,
 	return(get_ondisk(buf_offset, bufferp, isnew));
 }
 
-/*
- * Retrieve a pointer to a B-Tree node given a zone offset.
- * This function doesn't allocate a new node, it must already exist.
- */
-hammer_node_ondisk_t
-get_node(hammer_off_t node_offset, struct buffer_info **bufferp)
-{
-	return(get_buffer_data(node_offset, bufferp, 0));
-}
-
 /*
  * Return a pointer to a buffer data given a buffer offset.
  * If *bufferp is NULL acquire the buffer otherwise use that buffer.
-- 
2.41.0