Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Matthew Sakai and committed by
Mikulas Patocka
ec853402 2df8b310

+6 -30
+6 -5
drivers/md/dm-vdo/encodings.c
··· 172 172 * VDO_INCORRECT_COMPONENT if the component ids don't match, 173 173 * VDO_UNSUPPORTED_VERSION if the versions or sizes don't match. 174 174 */ 175 - int vdo_validate_header(const struct header *expected_header, 176 - const struct header *actual_header, bool exact_size, 177 - const char *name) 175 + static int vdo_validate_header(const struct header *expected_header, 176 + const struct header *actual_header, 177 + bool exact_size, const char *name) 178 178 { 179 179 int result; 180 180 ··· 210 210 *offset += sizeof(packed); 211 211 } 212 212 213 - void vdo_encode_header(u8 *buffer, size_t *offset, const struct header *header) 213 + static void vdo_encode_header(u8 *buffer, size_t *offset, 214 + const struct header *header) 214 215 { 215 216 struct packed_header packed = vdo_pack_header(header); 216 217 ··· 229 228 *version = vdo_unpack_version_number(packed); 230 229 } 231 230 232 - void vdo_decode_header(u8 *buffer, size_t *offset, struct header *header) 231 + static void vdo_decode_header(u8 *buffer, size_t *offset, struct header *header) 233 232 { 234 233 struct packed_header packed; 235 234
-25
drivers/md/dm-vdo/encodings.h
··· 708 708 } 709 709 710 710 /** 711 - * vdo_is_upgradable_version() - Check whether an actual version is upgradable to an expected 712 - * version. 713 - * @expected_version: The expected version. 714 - * @actual_version: The version being validated. 715 - * 716 - * An actual version is upgradable if its major number is expected but its minor number differs, 717 - * and the expected version's minor number is greater than the actual version's minor number. 718 - * 719 - * Return: true if the actual version is upgradable. 720 - */ 721 - static inline bool vdo_is_upgradable_version(struct version_number expected_version, 722 - struct version_number actual_version) 723 - { 724 - return ((expected_version.major_version == actual_version.major_version) && 725 - (expected_version.minor_version > actual_version.minor_version)); 726 - } 727 - 728 - int __must_check vdo_validate_header(const struct header *expected_header, 729 - const struct header *actual_header, bool exact_size, 730 - const char *component_name); 731 - 732 - void vdo_encode_header(u8 *buffer, size_t *offset, const struct header *header); 733 - void vdo_decode_header(u8 *buffer, size_t *offset, struct header *header); 734 - 735 - /** 736 711 * vdo_pack_version_number() - Convert a version_number to its packed on-disk representation. 737 712 * @version: The version number to convert. 738 713 *