openstack
/
liberasurecode
Code Issues Proposed changes

reorder add_fragment_metadata arg list to be consistent with rest of code

This commit is contained in:
Eric Lambert 2014-10-06 07:36:46 -07:00
parent 62fba6ba49
commit 8af7296205
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/erasurecode/erasurecode_postprocessing.h
View File

@ -33,8 +33,8 @@ int finalize_fragments_after_encode(ec_backend_t instance,
int k, int m, int blocksize, uint64_t orig_data_size,
char **encoded_data, char **encoded_parity);
void add_fragment_metadata(char *fragment,
void add_fragment_metadata(ec_backend_t instance, char *fragment,
int idx, uint64_t orig_data_size, int blocksize,
ec_checksum_type_t ct, int add_chksum, ec_backend_t instance);
ec_checksum_type_t ct, int add_chksum);
#endif

10
src/erasurecode.c
View File

@ -634,9 +634,9 @@ int liberasurecode_decode(int desc,
/* Generate headers */
char *fragment_ptr = data[missing_idx];
init_fragment_header(fragment_ptr);
add_fragment_metadata(fragment_ptr, missing_idx,
add_fragment_metadata(instance, fragment_ptr, missing_idx,
orig_data_size, blocksize, instance->args.uargs.ct,
!set_chksum, instance);
!set_chksum);
}
j++;
}
@ -798,9 +798,9 @@ int liberasurecode_reconstruct_fragment(int desc,
fragment_ptr = parity[destination_idx - k];
}
init_fragment_header(fragment_ptr);
add_fragment_metadata(fragment_ptr, destination_idx, orig_data_size,
blocksize, instance->args.uargs.ct,
!set_chksum, instance);
add_fragment_metadata(instance, fragment_ptr, destination_idx,
orig_data_size, blocksize, instance->args.uargs.ct,
!set_chksum);
/*
* Copy the reconstructed fragment to the output buffer

12
src/erasurecode_postprocessing.c
View File

@ -30,9 +30,9 @@
#include "erasurecode_helpers.h"
#include "erasurecode_stdinc.h"
void add_fragment_metadata(char *fragment,
void add_fragment_metadata(ec_backend_t be, char *fragment,
int idx, uint64_t orig_data_size, int blocksize,
ec_checksum_type_t ct, int add_chksum, ec_backend_t be)
ec_checksum_type_t ct, int add_chksum)
{
//TODO EDL we are ignoring the return codes here, fix that
set_libec_version(fragment);
@ -57,16 +57,16 @@ int finalize_fragments_after_encode(ec_backend_t instance,
/* finalize data fragments */
for (i = 0; i < k; i++) {
char *fragment = get_fragment_ptr_from_data(encoded_data[i]);
add_fragment_metadata(fragment, i, orig_data_size,
blocksize, ct, set_chksum, instance);
add_fragment_metadata(instance, fragment, i, orig_data_size,
blocksize, ct, set_chksum);
encoded_data[i] = fragment;
}
/* finalize parity fragments */
for (i = 0; i < m; i++) {
char *fragment = get_fragment_ptr_from_data(encoded_parity[i]);
add_fragment_metadata(fragment, i + k, orig_data_size,
blocksize, ct, set_chksum, instance);
add_fragment_metadata(instance, fragment, i + k, orig_data_size,
blocksize, ct, set_chksum);
encoded_parity[i] = fragment;
}