[Cluster-devel] [PATCH 07/20] libgfs2: Don't pass an extlen to block_map where not required

[Andrew Price]

Signed-off-by: Andrew Price <anprice at redhat.com>
---
 gfs2/fsck/fs_recovery.c | 3 +--
 gfs2/fsck/rgrepair.c    | 3 +--
 gfs2/libgfs2/recovery.c | 7 +++----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/gfs2/fsck/fs_recovery.c b/gfs2/fsck/fs_recovery.c
index 7284868b..4fd28796 100644
--- a/gfs2/fsck/fs_recovery.c
+++ b/gfs2/fsck/fs_recovery.c
@@ -406,7 +406,6 @@ static int check_journal_seq_no(struct gfs2_inode *ip, int fix)
 	uint64_t highest_seq = 0, lowest_seq = 0, prev_seq = 0;
 	int new = 0;
 	uint64_t dblock;
-	uint32_t extlen;
 	struct gfs2_buffer_head *bh;
 	int seq_errors = 0;
 
@@ -443,7 +442,7 @@ static int check_journal_seq_no(struct gfs2_inode *ip, int fix)
 		lh.lh_sequence = highest_seq;
 		prev_seq = lh.lh_sequence;
 		log_warn( _("Renumbering it as 0x%llx\n"), lh.lh_sequence);
-		block_map(ip, blk, &new, &dblock, &extlen, FALSE);
+		block_map(ip, blk, &new, &dblock, NULL, FALSE);
 		bh = bread(ip->i_sbd, dblock);
 		gfs2_log_header_out_bh(&lh, bh);
 		brelse(bh);
diff --git a/gfs2/fsck/rgrepair.c b/gfs2/fsck/rgrepair.c
index d9a33705..44f268a8 100644
--- a/gfs2/fsck/rgrepair.c
+++ b/gfs2/fsck/rgrepair.c
@@ -53,7 +53,6 @@ static void find_journaled_rgs(struct gfs2_sbd *sdp)
 	int j, new = 0;
 	unsigned int jblocks;
 	uint64_t b, dblock;
-	uint32_t extlen;
 	struct gfs2_inode *ip;
 	struct gfs2_buffer_head *bh;
 	int false_count;
@@ -67,7 +66,7 @@ static void find_journaled_rgs(struct gfs2_sbd *sdp)
 		jblocks = ip->i_di.di_size / sdp->sd_sb.sb_bsize;
 		false_count = 0;
 		for (b = 0; b < jblocks; b++) {
-			block_map(ip, b, &new, &dblock, &extlen, 0);
+			block_map(ip, b, &new, &dblock, NULL, 0);
 			if (!dblock)
 				break;
 			bh = bread(sdp, dblock);
diff --git a/gfs2/libgfs2/recovery.c b/gfs2/libgfs2/recovery.c
index b813d698..71f907b0 100644
--- a/gfs2/libgfs2/recovery.c
+++ b/gfs2/libgfs2/recovery.c
@@ -27,9 +27,8 @@ int gfs2_replay_read_block(struct gfs2_inode *ip, unsigned int blk,
 {
 	int new = 0;
 	uint64_t dblock;
-	uint32_t extlen;
 
-	block_map(ip, blk, &new, &dblock, &extlen, FALSE);
+	block_map(ip, blk, &new, &dblock, NULL, FALSE);
 	if (!dblock)
 		return -EIO;
 
@@ -220,14 +219,14 @@ int clean_journal(struct gfs2_inode *ip, struct gfs2_log_header *head)
 {
 	unsigned int lblock;
 	struct gfs2_log_header *lh;
-	uint32_t hash, extlen;
+	uint32_t hash;
 	struct gfs2_buffer_head *bh;
 	int new = 0;
 	uint64_t dblock;
 
 	lblock = head->lh_blkno;
 	gfs2_replay_incr_blk(ip, &lblock);
-	block_map(ip, lblock, &new, &dblock, &extlen, 0);
+	block_map(ip, lblock, &new, &dblock, NULL, 0);
 	if (!dblock)
 		return -EIO;
 
-- 
2.14.3