Tidy up lblk percpu stuff

This commit is contained in:
Tom Marshall 2019-11-03 08:28:13 -08:00
parent f90c744a38
commit 309bb2d5ef
1 changed files with 9 additions and 21 deletions

View File

@ -105,7 +105,7 @@ struct lblk_compress_state {
};
static struct lblk_compress_state*
lblk_get_compress_state(void* percpu, const struct cbd_params* params, int cpu)
lblk_get_compress_state(void* percpu, int cpu)
{
struct lblk_compress_state** statep;
@ -122,11 +122,8 @@ lblk_compress_lz4(struct lbd* lbd)
struct lblk_compress_state* state;
cpu = get_cpu();
state = lblk_get_compress_state(lbd->percpu, lbd->params, cpu);
if (!state) {
put_cpu();
return 0;
}
state = lblk_get_compress_state(lbd->percpu, cpu);
BUG_ON(state == NULL);
clen = LZ4_compress_fast(lbd->buf, state->buf,
PBLK_SIZE * lblk_per_pblk(lbd->params),
PBLK_SIZE * (lblk_per_pblk(lbd->params) - 1),
@ -150,11 +147,8 @@ lblk_decompress_lz4(struct lbd* lbd)
u32 dlen = PBLK_SIZE * lblk_per_pblk(lbd->params);
cpu = get_cpu();
state = lblk_get_compress_state(lbd->percpu, lbd->params, cpu);
if (!state) {
put_cpu();
return false;
}
state = lblk_get_compress_state(lbd->percpu, cpu);
BUG_ON(state == NULL);
ret = LZ4_decompress_safe(lbd->buf,
state->buf,
lbd->c_len,
@ -181,11 +175,8 @@ lblk_compress_zlib(struct lbd* lbd)
z_stream* stream;
cpu = get_cpu();
state = lblk_get_compress_state(lbd->percpu, lbd->params, cpu);
if (!state) {
put_cpu();
return 0;
}
state = lblk_get_compress_state(lbd->percpu, cpu);
BUG_ON(state == NULL);
stream = &state->zlib_cstream;
ret = zlib_deflateReset(stream);
BUG_ON(ret != Z_OK);
@ -215,11 +206,8 @@ lblk_decompress_zlib(struct lbd* lbd)
u32 dlen = PBLK_SIZE * lblk_per_pblk(lbd->params);
cpu = get_cpu();
state = lblk_get_compress_state(lbd->percpu, lbd->params, cpu);
if (!state) {
put_cpu();
return false;
}
state = lblk_get_compress_state(lbd->percpu, cpu);
BUG_ON(state == NULL);
stream = &state->zlib_dstream;
ret = zlib_inflateReset(stream);
BUG_ON(ret != Z_OK);