File 2001-btrfs-convert-remove-unused-fs-argument-fr... of Package btrfsprogs

Overview Repositories Revisions Requests Users Attributes Meta

File 2001-btrfs-convert-remove-unused-fs-argument-from-block_i.patch of Package btrfsprogs

From f751711fb48e566976522e240e8380c84e07f52c Mon Sep 17 00:00:00 2001
From: Jeff Mahoney <jeffm@suse.com>
Date: Thu, 15 Aug 2013 21:30:05 -0400
Subject: [PATCH 02/10] btrfs-convert: remove unused fs argument from
 block_iterate_proc

The fs argument is unused, so let's not pass it.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
 btrfs-convert.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- a/btrfs-convert.c
+++ b/btrfs-convert.c
@@ -430,8 +430,7 @@ static int record_file_blocks(struct blk
 				num_bytes);
 }
 
-static int block_iterate_proc(ext2_filsys ext2_fs,
-			      u64 disk_block, u64 file_block,
+static int block_iterate_proc(u64 disk_block, u64 file_block,
 		              struct blk_iterate_data *idata)
 {
 	int ret;
@@ -488,7 +487,7 @@ static int __block_iterate_proc(ext2_fil
 {
 	struct blk_iterate_data *idata;
 	idata = (struct blk_iterate_data *)priv_data;
-	return block_iterate_proc(fs, *blocknr, blockcnt, idata);
+	return block_iterate_proc(*blocknr, blockcnt, idata);
 }
 
 /*
@@ -1118,7 +1117,7 @@ static int create_image_file_range(struc
 	for (; start_byte < end_byte; block++, start_byte += blocksize) {
 		if (!ext2fs_fast_test_block_bitmap(ext2_fs->block_map, block))
 			continue;
-		ret = block_iterate_proc(NULL, block, block, &data);
+		ret = block_iterate_proc(block, block, &data);
 		if (ret & BLOCK_ABORT) {
 			ret = data.errcode;
 			goto fail;
@@ -1863,7 +1862,7 @@ static int relocate_one_reference(struct
 			BUG_ON(ret);
 		}
 
-		ret = block_iterate_proc(NULL, new_pos / sectorsize,
+		ret = block_iterate_proc(new_pos / sectorsize,
 					 cur_offset / sectorsize, &data);
 		if (ret & BLOCK_ABORT) {
 			ret = data.errcode;

Places

File 2001-btrfs-convert-remove-unused-fs-argument-from-block_i.patch of Package btrfsprogs

Places