mirror of
https://github.com/torvalds/linux.git
synced 2026-03-08 01:04:41 +01:00
dm vdo encodings: clean up header and version functions
Make several header functions static. Also remove vdo_is_upgradable_version, which is unused. Signed-off-by: Matthew Sakai <msakai@redhat.com> Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
This commit is contained in:
parent
2df8b310bc
commit
ec8534021a
2 changed files with 6 additions and 30 deletions
|
|
@ -172,9 +172,9 @@ static int __must_check validate_version(struct version_number expected_version,
|
|||
* VDO_INCORRECT_COMPONENT if the component ids don't match,
|
||||
* VDO_UNSUPPORTED_VERSION if the versions or sizes don't match.
|
||||
*/
|
||||
int vdo_validate_header(const struct header *expected_header,
|
||||
const struct header *actual_header, bool exact_size,
|
||||
const char *name)
|
||||
static int vdo_validate_header(const struct header *expected_header,
|
||||
const struct header *actual_header,
|
||||
bool exact_size, const char *name)
|
||||
{
|
||||
int result;
|
||||
|
||||
|
|
@ -210,7 +210,8 @@ static void encode_version_number(u8 *buffer, size_t *offset,
|
|||
*offset += sizeof(packed);
|
||||
}
|
||||
|
||||
void vdo_encode_header(u8 *buffer, size_t *offset, const struct header *header)
|
||||
static void vdo_encode_header(u8 *buffer, size_t *offset,
|
||||
const struct header *header)
|
||||
{
|
||||
struct packed_header packed = vdo_pack_header(header);
|
||||
|
||||
|
|
@ -228,7 +229,7 @@ static void decode_version_number(u8 *buffer, size_t *offset,
|
|||
*version = vdo_unpack_version_number(packed);
|
||||
}
|
||||
|
||||
void vdo_decode_header(u8 *buffer, size_t *offset, struct header *header)
|
||||
static void vdo_decode_header(u8 *buffer, size_t *offset, struct header *header)
|
||||
{
|
||||
struct packed_header packed;
|
||||
|
||||
|
|
|
|||
|
|
@ -707,31 +707,6 @@ static inline bool vdo_are_same_version(struct version_number version_a,
|
|||
(version_a.minor_version == version_b.minor_version));
|
||||
}
|
||||
|
||||
/**
|
||||
* vdo_is_upgradable_version() - Check whether an actual version is upgradable to an expected
|
||||
* version.
|
||||
* @expected_version: The expected version.
|
||||
* @actual_version: The version being validated.
|
||||
*
|
||||
* An actual version is upgradable if its major number is expected but its minor number differs,
|
||||
* and the expected version's minor number is greater than the actual version's minor number.
|
||||
*
|
||||
* Return: true if the actual version is upgradable.
|
||||
*/
|
||||
static inline bool vdo_is_upgradable_version(struct version_number expected_version,
|
||||
struct version_number actual_version)
|
||||
{
|
||||
return ((expected_version.major_version == actual_version.major_version) &&
|
||||
(expected_version.minor_version > actual_version.minor_version));
|
||||
}
|
||||
|
||||
int __must_check vdo_validate_header(const struct header *expected_header,
|
||||
const struct header *actual_header, bool exact_size,
|
||||
const char *component_name);
|
||||
|
||||
void vdo_encode_header(u8 *buffer, size_t *offset, const struct header *header);
|
||||
void vdo_decode_header(u8 *buffer, size_t *offset, struct header *header);
|
||||
|
||||
/**
|
||||
* vdo_pack_version_number() - Convert a version_number to its packed on-disk representation.
|
||||
* @version: The version number to convert.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue