From 22b23697054400f59703e2cb16ce000a04661880 Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Mon, 26 Sep 2016 09:52:20 +0900 Subject: [PATCH] sbin/hammer: Remove get_ondisk() after previous commits After the previous commits, a static function get_ondisk() is only used by get_buffer_data() which is a function for arbitrary ondisk data, so it can simply be a part of get_buffer_data(). --- sbin/hammer/ondisk.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sbin/hammer/ondisk.c b/sbin/hammer/ondisk.c index 848f6a5d0d..fa41bdad91 100644 --- a/sbin/hammer/ondisk.c +++ b/sbin/hammer/ondisk.c @@ -39,8 +39,6 @@ static void check_volume(struct volume_info *vol); static void get_buffer_readahead(struct buffer_info *base); -static void *get_ondisk(hammer_off_t buf_offset, struct buffer_info **bufferp, - int isnew); static __inline int readhammervol(struct volume_info *vol); static __inline int readhammerbuf(struct buffer_info *buf); static __inline int writehammervol(struct volume_info *vol); @@ -410,16 +408,7 @@ get_buffer_data(hammer_off_t buf_offset, struct buffer_info **bufferp, *bufferp = NULL; } } - return(get_ondisk(buf_offset, bufferp, isnew)); -} -/* - * Return a pointer to a buffer data given a buffer offset. - * If *bufferp is NULL acquire the buffer otherwise use that buffer. - */ -static void * -get_ondisk(hammer_off_t buf_offset, struct buffer_info **bufferp, int isnew) -{ if (*bufferp == NULL) { *bufferp = get_buffer(buf_offset, isnew); if (*bufferp == NULL) -- 2.11.4.GIT