From 8bb05ac73a5b448b339ce0bc8d396c82c459b47f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 14 Apr 2024 21:33:32 +0200 Subject: Merging upstream version 2.40. Signed-off-by: Daniel Baumann --- libblkid/src/superblocks/lvm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libblkid/src/superblocks/lvm.c') diff --git a/libblkid/src/superblocks/lvm.c b/libblkid/src/superblocks/lvm.c index eea74d6..0a3d505 100644 --- a/libblkid/src/superblocks/lvm.c +++ b/libblkid/src/superblocks/lvm.c @@ -76,11 +76,11 @@ static int probe_lvm2(blkid_probe pr, const struct blkid_idmag *mag) int sector = mag->kboff << 1; struct lvm2_pv_label_header *label; char uuid[LVM2_ID_LEN + 7]; - unsigned char *buf; + const unsigned char *buf; buf = blkid_probe_get_buffer(pr, mag->kboff << 10, - 512 + sizeof(struct lvm2_pv_label_header)); + 512 + LVM2_LABEL_SIZE); if (!buf) return errno ? -errno : 1; @@ -122,7 +122,7 @@ static int probe_lvm2(blkid_probe pr, const struct blkid_idmag *mag) static int probe_lvm1(blkid_probe pr, const struct blkid_idmag *mag) { - struct lvm1_pv_label_header *label; + const struct lvm1_pv_label_header *label; char uuid[LVM2_ID_LEN + 7]; unsigned int version; @@ -158,7 +158,7 @@ struct verity_sb { static int probe_verity(blkid_probe pr, const struct blkid_idmag *mag) { - struct verity_sb *sb; + const struct verity_sb *sb; unsigned int version; sb = blkid_probe_get_sb(pr, mag, struct verity_sb); @@ -187,7 +187,7 @@ struct integrity_sb { static int probe_integrity(blkid_probe pr, const struct blkid_idmag *mag) { - struct integrity_sb *sb; + const struct integrity_sb *sb; sb = blkid_probe_get_sb(pr, mag, struct integrity_sb); if (sb == NULL) -- cgit v1.2.3