Commit 8f3332ee authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: acomp - Remove acomp request flags 



The acomp request flags field duplicates the base request flags
and is confusing.  Remove it.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent fc4bd01d

crypto/acompress.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ void acomp_request_free(struct acomp_req *req) 
	if (tfm->__crt_alg->cra_type != &crypto_acomp_type)

		crypto_acomp_scomp_free_ctx(req);



	if (req->flags & CRYPTO_ACOMP_ALLOC_OUTPUT) {

	if (req->base.flags & CRYPTO_ACOMP_ALLOC_OUTPUT) {

		acomp->dst_free(req->dst);

		req->dst = NULL;

	}

include/crypto/acompress.h

+2 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
 * @dst:	Destination data

 * @slen:	Size of the input buffer

 * @dlen:	Size of the output buffer and number of bytes produced

 * @flags:	Internal flags

 * @__ctx:	Start of private context data

 */

struct acomp_req {
@@ -33,7 +32,6 @@ struct acomp_req { 
	struct scatterlist *dst;

	unsigned int slen;

	unsigned int dlen;

	u32 flags;

	void *__ctx[] CRYPTO_MINALIGN_ATTR;

};
@@ -232,9 +230,9 @@ static inline void acomp_request_set_params(struct acomp_req *req, 
	req->slen = slen;

	req->dlen = dlen;



	req->flags &= ~CRYPTO_ACOMP_ALLOC_OUTPUT;

	req->base.flags &= ~CRYPTO_ACOMP_ALLOC_OUTPUT;

	if (!req->dst)

		req->flags |= CRYPTO_ACOMP_ALLOC_OUTPUT;

		req->base.flags |= CRYPTO_ACOMP_ALLOC_OUTPUT;

}



/**