btrfs-progs: remove unused argument from btrfs_csum_data

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/chunk-recover.c b/chunk-recover.c
index e6b26ac..c1aea39 100644 (file)
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1911,7 +1911,7 @@ static int check_one_csum(int fd, u64 start, u32 len, u32 tree_csum)
                goto out;
        }
        ret = 0;
-       csum_result = btrfs_csum_data(NULL, data, csum_result, len);
+       csum_result = btrfs_csum_data(data, csum_result, len);
        btrfs_csum_final(csum_result, (u8 *)&csum_result);
        if (csum_result != tree_csum)
                ret = 1;

diff --git a/cmds-check.c b/cmds-check.c
index d7fcf9d..dfb3476 100644 (file)
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -7119,7 +7119,7 @@ again:
                        csum = ~(u32)0;
                        tmp = offset + data_checked;
 
-                       csum = btrfs_csum_data(NULL, (char *)data + tmp,
+                       csum = btrfs_csum_data((char *)data + tmp,
                                               csum, root->sectorsize);
                        btrfs_csum_final(csum, (u8 *)&csum);
 

diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index 318d6e6..ee2c8e3 100644 (file)
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -41,7 +41,7 @@ static int check_csum_sblock(void *sb, int csum_size)
        u8 result[BTRFS_CSUM_SIZE];
        u32 crc = ~(u32)0;
 
-       crc = btrfs_csum_data(NULL, (char *)sb + BTRFS_CSUM_SIZE,
+       crc = btrfs_csum_data((char *)sb + BTRFS_CSUM_SIZE,
                                crc, BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE);
        btrfs_csum_final(crc, result);
 

diff --git a/convert/common.c b/convert/common.c
index d87d75e..40bf32c 100644 (file)
--- a/convert/common.c
+++ b/convert/common.c
@@ -64,7 +64,7 @@ static inline int write_temp_super(int fd, struct btrfs_super_block *sb,
        u32 crc = ~(u32)0;
        int ret;
 
-       crc = btrfs_csum_data(NULL, (char *)sb + BTRFS_CSUM_SIZE, crc,
+       crc = btrfs_csum_data((char *)sb + BTRFS_CSUM_SIZE, crc,
                              BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE);
        btrfs_csum_final(crc, &sb->csum[0]);
        ret = pwrite(fd, sb, BTRFS_SUPER_INFO_SIZE, sb_bytenr);

diff --git a/disk-io.c b/disk-io.c
index f182a1d..ae47a37 100644 (file)
--- a/disk-io.c
+++ b/disk-io.c
@@ -118,7 +118,7 @@ static void print_tree_block_error(struct btrfs_fs_info *fs_info,
        }
 }
 
-u32 btrfs_csum_data(struct btrfs_root *root, char *data, u32 seed, size_t len)
+u32 btrfs_csum_data(char *data, u32 seed, size_t len)
 {
        return crc32c(seed, data, len);
 }
@@ -1463,7 +1463,7 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
        csum_size = btrfs_csum_sizes[csum_type];
 
        crc = ~(u32)0;
-       crc = btrfs_csum_data(NULL, (char *)sb + BTRFS_CSUM_SIZE, crc,
+       crc = btrfs_csum_data((char *)sb + BTRFS_CSUM_SIZE, crc,
                              BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE);
        btrfs_csum_final(crc, result);
 
@@ -1669,7 +1669,7 @@ static int write_dev_supers(struct btrfs_root *root,
        if (root->fs_info->super_bytenr != BTRFS_SUPER_INFO_OFFSET) {
                btrfs_set_super_bytenr(sb, root->fs_info->super_bytenr);
                crc = ~(u32)0;
-               crc = btrfs_csum_data(NULL, (char *)sb + BTRFS_CSUM_SIZE, crc,
+               crc = btrfs_csum_data((char *)sb + BTRFS_CSUM_SIZE, crc,
                                      BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE);
                btrfs_csum_final(crc, &sb->csum[0]);
 
@@ -1693,7 +1693,7 @@ static int write_dev_supers(struct btrfs_root *root,
                btrfs_set_super_bytenr(sb, bytenr);
 
                crc = ~(u32)0;
-               crc = btrfs_csum_data(NULL, (char *)sb + BTRFS_CSUM_SIZE, crc,
+               crc = btrfs_csum_data((char *)sb + BTRFS_CSUM_SIZE, crc,
                                      BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE);
                btrfs_csum_final(crc, &sb->csum[0]);
 

diff --git a/disk-io.h b/disk-io.h
index 08ee5ce..a9c6fc5 100644 (file)
--- a/disk-io.h
+++ b/disk-io.h
@@ -188,7 +188,7 @@ int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid);
 int btrfs_set_buffer_uptodate(struct extent_buffer *buf);
 int wait_on_tree_block_writeback(struct btrfs_root *root,
                                 struct extent_buffer *buf);
-u32 btrfs_csum_data(struct btrfs_root *root, char *data, u32 seed, size_t len);
+u32 btrfs_csum_data(char *data, u32 seed, size_t len);
 void btrfs_csum_final(u32 crc, u8 *result);
 
 int btrfs_commit_transaction(struct btrfs_trans_handle *trans,

diff --git a/file-item.c b/file-item.c
index 7f2f95b..333fa33 100644 (file)
--- a/file-item.c
+++ b/file-item.c
@@ -310,7 +310,7 @@ csum:
        item = (struct btrfs_csum_item *)((unsigned char *)item +
                                          csum_offset * csum_size);
 found:
-       csum_result = btrfs_csum_data(root, data, csum_result, len);
+       csum_result = btrfs_csum_data(data, csum_result, len);
        btrfs_csum_final(csum_result, (u8 *)&csum_result);
        if (csum_result == 0) {
                printk("csum result is 0 for block %llu\n",