Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aedb6e24 authored by Jon Derrick's avatar Jon Derrick Committed by Jens Axboe
Browse files

block/sed: Use ssize_t on atom parsers to return errors 



The short atom parser can return an errno from decoding but does not
currently return the error as a signed value. Convert all of the parsers
to ssize_t.

Signed-off-by: default avatarJon Derrick <jonathan.derrick@intel.com>
Reviewed-by: default avatarScott Bauer <scott.bauer@intel.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent bd1599d9

block/sed-opal.c

+14 −14
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ static enum opal_token response_get_token(const struct parsed_resp *resp, 
	return tok->pos[0];

}



static size_t response_parse_tiny(struct opal_resp_tok *tok,

static ssize_t response_parse_tiny(struct opal_resp_tok *tok,

				   const u8 *pos)

{

	tok->pos = pos;
@@ -723,7 +723,7 @@ static size_t response_parse_tiny(struct opal_resp_tok *tok, 
	return tok->len;

}



static size_t response_parse_short(struct opal_resp_tok *tok,

static ssize_t response_parse_short(struct opal_resp_tok *tok,

				    const u8 *pos)

{

	tok->pos = pos;
@@ -736,7 +736,7 @@ static size_t response_parse_short(struct opal_resp_tok *tok, 
		tok->type = OPAL_DTA_TOKENID_SINT;

	} else {

		u64 u_integer = 0;

		int i, b = 0;

		ssize_t i, b = 0;



		tok->type = OPAL_DTA_TOKENID_UINT;

		if (tok->len > 9) {
@@ -753,7 +753,7 @@ static size_t response_parse_short(struct opal_resp_tok *tok, 
	return tok->len;

}



static size_t response_parse_medium(struct opal_resp_tok *tok,

static ssize_t response_parse_medium(struct opal_resp_tok *tok,

				     const u8 *pos)

{

	tok->pos = pos;
@@ -770,7 +770,7 @@ static size_t response_parse_medium(struct opal_resp_tok *tok, 
	return tok->len;

}



static size_t response_parse_long(struct opal_resp_tok *tok,

static ssize_t response_parse_long(struct opal_resp_tok *tok,

				   const u8 *pos)

{

	tok->pos = pos;
@@ -787,7 +787,7 @@ static size_t response_parse_long(struct opal_resp_tok *tok, 
	return tok->len;

}



static size_t response_parse_token(struct opal_resp_tok *tok,

static ssize_t response_parse_token(struct opal_resp_tok *tok,

				    const u8 *pos)

{

	tok->pos = pos;
@@ -805,7 +805,7 @@ static int response_parse(const u8 *buf, size_t length, 
	struct opal_resp_tok *iter;

	int num_entries = 0;

	int total;

	size_t token_length;

	ssize_t token_length;

	const u8 *pos;



	if (!buf)
@@ -851,8 +851,8 @@ static int response_parse(const u8 *buf, size_t length, 
		else /* TOKEN */

			token_length = response_parse_token(iter, pos);



		if (token_length == -EINVAL)

			return -EINVAL;

		if (token_length < 0)

			return token_length;



		pos += token_length;

		total -= token_length;