[Cluster-devel] [PATCH 16/20] libgfs2: Remove gfs2_log_header_out_bh

[Andrew Price <anprice@redhat.com>]

Signed-off-by: Andrew Price <anprice@redhat.com>
---
 gfs2/fsck/fs_recovery.c   | 3 ++-
 gfs2/libgfs2/libgfs2.h    | 1 -
 gfs2/libgfs2/ondisk.c     | 6 ------
 gfs2/libgfs2/structures.c | 2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/gfs2/fsck/fs_recovery.c b/gfs2/fsck/fs_recovery.c
index 740334da..677abd75 100644
--- a/gfs2/fsck/fs_recovery.c
+++ b/gfs2/fsck/fs_recovery.c
@@ -444,7 +444,8 @@ static int check_journal_seq_no(struct gfs2_inode *ip, int fix)
 		log_warn( _("Renumbering it as 0x%llx\n"), lh.lh_sequence);
 		block_map(ip, blk, &new, &dblock, NULL, FALSE);
 		bh = bread(ip->i_sbd, dblock);
-		gfs2_log_header_out_bh(&lh, bh);
+		gfs2_log_header_out(&lh, bh->b_data);
+		bmodified(bh);
 		brelse(bh);
 	}
 	if (seq_errors && fix) {
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index 82900fb5..f83caaad 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -742,7 +742,6 @@ extern void gfs2_log_header_v1_in(struct gfs2_log_header *lh, char *buf);
 extern void gfs2_log_header_in(struct gfs2_log_header *lh, char *buf);
 extern void gfs2_log_header_v1_out(struct gfs2_log_header *lh, char *buf);
 extern void gfs2_log_header_out(struct gfs2_log_header *lh, char *buf);
-extern void gfs2_log_header_out_bh(struct gfs2_log_header *lh, struct gfs2_buffer_head *bh);
 extern void gfs2_log_descriptor_in(struct gfs2_log_descriptor *ld,
 				   struct gfs2_buffer_head *bh);
 extern void gfs2_log_descriptor_out(struct gfs2_log_descriptor *ld,
diff --git a/gfs2/libgfs2/ondisk.c b/gfs2/libgfs2/ondisk.c
index fb8815d7..d030cb16 100644
--- a/gfs2/libgfs2/ondisk.c
+++ b/gfs2/libgfs2/ondisk.c
@@ -597,12 +597,6 @@ void gfs2_log_header_out(struct gfs2_log_header *lh, char *buf)
 #endif
 }
 
-void gfs2_log_header_out_bh(struct gfs2_log_header *lh, struct gfs2_buffer_head *bh)
-{
-	gfs2_log_header_out(lh, bh->iov.iov_base);
-	bmodified(bh);
-}
-
 void gfs2_log_header_v1_print(const struct gfs2_log_header *lh)
 {
 	gfs2_meta_header_print(&lh->lh_header);
diff --git a/gfs2/libgfs2/structures.c b/gfs2/libgfs2/structures.c
index 51e7d077..310ba3c1 100644
--- a/gfs2/libgfs2/structures.c
+++ b/gfs2/libgfs2/structures.c
@@ -232,7 +232,7 @@ int write_journal(struct gfs2_inode *jnl, unsigned bsize, unsigned int blocks)
 		memset(bh->b_data, 0, bsize);
 		lh.lh_sequence = seq;
 		lh.lh_blkno = x;
-		gfs2_log_header_out_bh(&lh, bh);
+		gfs2_log_header_out(&lh, bh->b_data);
 		hash = lgfs2_log_header_hash(bh->b_data);
 		((struct gfs2_log_header *)bh->b_data)->lh_hash = cpu_to_be32(hash);
 #ifdef GFS2_HAS_LH_V2
-- 
2.14.3