From nobody Tue Dec 28 17:51:10 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 44F9A190F706; Tue, 28 Dec 2021 17:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JNhsq4wPZz3F7t; Tue, 28 Dec 2021 17:51:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 077E1160C0; Tue, 28 Dec 2021 17:51:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BSHpApE053595; Tue, 28 Dec 2021 17:51:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BSHpATg053594; Tue, 28 Dec 2021 17:51:10 GMT (envelope-from git) Date: Tue, 28 Dec 2021 17:51:10 GMT Message-Id: <202112281751.1BSHpATg053594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0ff783dc15f3 - main - sys/geom: Use C99 fixed-width integer types. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ff783dc15f319033f22c4e8e8f88431078a0b3b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640713872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2JsHeU4ZAoZxIFoUBo6RpG9fm0ojc4TT45opKWY6koE=; b=BYMnk9BjDBofz5bPDnlE+n4T0shd2nCflCFh6HLLn0q44uB/osSLZGnZbxOH1D5KdM4yo7 y5w18dgMWfhOLKSmQz5TUQkoOu4PojcLD9Em1nvu2qsViZ7dtLuIR7CyBSRuUTugDIyoau JV6EZboPmUVLKr+ME4aFararx0j/sBPrJK13hhVs9Xztk0V9SR6vhzIOJLjyjqA3HKD+N8 L7WLFhq4MpOgg5A7QCsYB9Z6I6g9VQs+CzJNLSkBFbuVuwvVdLzCa5RDdf7VgH7oMO0THc 6/FHxEZ/73mzXyjBpTknB9kjXMoikZekPd4ybo/SkTcl2Hze/MXIRVq4uJt/TA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640713872; a=rsa-sha256; cv=none; b=nS3ugQrKk75eFs9w/Bb5F0EjXfvuj63HeZhzpX0gNZDX4fqMWJw3vRCkr2/gqZDgfjXokh 2UAfxBo5EcUOirK4ZvNYrNHztam2rM7uX1nsUUNLhNIltIfjeSGZfoiHWohdfPbgJn7Huz Mp0IMP4uRhOzbdiZ/F1kUrapjhXYVTg2+P9Qt5yB+0bgPUQh6jNrO2zY/l8WoooZQ1U6Xc rfFIl2f5D6xgqJHU0Q6E10QXLpmQmEAGtXTWMRfAM46XGYkX6OkSufEaM9wyyXVQQu3UDy zcOa0IJBEzFANAo413+eEzny7jSt7KorB0+wUm5sohqqj8yf+BS38J4m7rirmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0ff783dc15f319033f22c4e8e8f88431078a0b3b commit 0ff783dc15f319033f22c4e8e8f88431078a0b3b Author: John Baldwin AuthorDate: 2021-12-28 17:41:51 +0000 Commit: John Baldwin CommitDate: 2021-12-28 17:41:51 +0000 sys/geom: Use C99 fixed-width integer types. No functional change. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33635 --- sys/geom/geom_ccd.c | 4 ++-- sys/geom/part/g_part_bsd64.c | 36 ++++++++++++++++++------------------ sys/geom/raid/md_intel.c | 2 +- sys/geom/raid/md_jmicron.c | 36 ++++++++++++++++++------------------ 4 files changed, 39 insertions(+), 39 deletions(-) diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c index 7f4dd3ca11ff..6fe27fe90338 100644 --- a/sys/geom/geom_ccd.c +++ b/sys/geom/geom_ccd.c @@ -166,10 +166,10 @@ struct ccd_s { u_int sc_ndisks; /* number of components */ struct ccdcinfo *sc_cinfo; /* component info */ struct ccdiinfo *sc_itable; /* interleave table */ - u_int32_t sc_secsize; /* # bytes per sector */ + uint32_t sc_secsize; /* # bytes per sector */ int sc_pick; /* side of mirror picked */ daddr_t sc_blk[2]; /* mirror localization */ - u_int32_t sc_offset; /* actual offset used */ + uint32_t sc_offset; /* actual offset used */ }; static g_start_t g_ccd_start; diff --git a/sys/geom/part/g_part_bsd64.c b/sys/geom/part/g_part_bsd64.c index bc0112fbb7ed..998ffc627fc4 100644 --- a/sys/geom/part/g_part_bsd64.c +++ b/sys/geom/part/g_part_bsd64.c @@ -58,18 +58,18 @@ FEATURE(geom_part_bsd64, "GEOM partitioning class for 64-bit BSD disklabels"); struct disklabel64 { char d_reserved0[512]; /* reserved or unused */ - u_int32_t d_magic; /* the magic number */ - u_int32_t d_crc; /* crc32() d_magic through last part */ - u_int32_t d_align; /* partition alignment requirement */ - u_int32_t d_npartitions; /* number of partitions */ + uint32_t d_magic; /* the magic number */ + uint32_t d_crc; /* crc32() d_magic through last part */ + uint32_t d_align; /* partition alignment requirement */ + uint32_t d_npartitions; /* number of partitions */ struct uuid d_stor_uuid; /* unique uuid for label */ - u_int64_t d_total_size; /* total size incl everything (bytes) */ - u_int64_t d_bbase; /* boot area base offset (bytes) */ + uint64_t d_total_size; /* total size incl everything (bytes) */ + uint64_t d_bbase; /* boot area base offset (bytes) */ /* boot area is pbase - bbase */ - u_int64_t d_pbase; /* first allocatable offset (bytes) */ - u_int64_t d_pstop; /* last allocatable offset+1 (bytes) */ - u_int64_t d_abase; /* location of backup copy if not 0 */ + uint64_t d_pbase; /* first allocatable offset (bytes) */ + uint64_t d_pstop; /* last allocatable offset+1 (bytes) */ + uint64_t d_abase; /* location of backup copy if not 0 */ u_char d_packname[64]; u_char d_reserved[64]; @@ -86,15 +86,15 @@ struct disklabel64 { * is identified by its uuid. */ struct partition64 { /* the partition table */ - u_int64_t p_boffset; /* slice relative offset, in bytes */ - u_int64_t p_bsize; /* size of partition, in bytes */ - u_int8_t p_fstype; - u_int8_t p_unused01; /* reserved, must be 0 */ - u_int8_t p_unused02; /* reserved, must be 0 */ - u_int8_t p_unused03; /* reserved, must be 0 */ - u_int32_t p_unused04; /* reserved, must be 0 */ - u_int32_t p_unused05; /* reserved, must be 0 */ - u_int32_t p_unused06; /* reserved, must be 0 */ + uint64_t p_boffset; /* slice relative offset, in bytes */ + uint64_t p_bsize; /* size of partition, in bytes */ + uint8_t p_fstype; + uint8_t p_unused01; /* reserved, must be 0 */ + uint8_t p_unused02; /* reserved, must be 0 */ + uint8_t p_unused03; /* reserved, must be 0 */ + uint32_t p_unused04; /* reserved, must be 0 */ + uint32_t p_unused05; /* reserved, must be 0 */ + uint32_t p_unused06; /* reserved, must be 0 */ struct uuid p_type_uuid;/* mount type as UUID */ struct uuid p_stor_uuid;/* unique uuid for storage */ } d_partitions[MAXPARTITIONS64];/* actually may be more */ diff --git a/sys/geom/raid/md_intel.c b/sys/geom/raid/md_intel.c index 54fa7535bc0e..bdf5c1a5c06a 100644 --- a/sys/geom/raid/md_intel.c +++ b/sys/geom/raid/md_intel.c @@ -80,7 +80,7 @@ struct intel_raid_map { struct intel_raid_vol { uint8_t name[16]; - u_int64_t total_sectors __packed; + uint64_t total_sectors __packed; uint32_t state; #define INTEL_ST_BOOTABLE 0x00000001 #define INTEL_ST_BOOT_DEVICE 0x00000002 diff --git a/sys/geom/raid/md_jmicron.c b/sys/geom/raid/md_jmicron.c index 02da9e1f02ab..939e05f78017 100644 --- a/sys/geom/raid/md_jmicron.c +++ b/sys/geom/raid/md_jmicron.c @@ -52,29 +52,29 @@ static MALLOC_DEFINE(M_MD_JMICRON, "md_jmicron_data", "GEOM_RAID JMicron metadat #define JMICRON_MAX_SPARE 2 struct jmicron_raid_conf { - u_int8_t signature[2]; + uint8_t signature[2]; #define JMICRON_MAGIC "JM" - u_int16_t version; + uint16_t version; #define JMICRON_VERSION 0x0001 - u_int16_t checksum; - u_int8_t filler_1[10]; - u_int32_t disk_id; - u_int32_t offset; - u_int32_t disk_sectors_high; - u_int16_t disk_sectors_low; - u_int8_t filler_2[2]; - u_int8_t name[16]; - u_int8_t type; + uint16_t checksum; + uint8_t filler_1[10]; + uint32_t disk_id; + uint32_t offset; + uint32_t disk_sectors_high; + uint16_t disk_sectors_low; + uint8_t filler_2[2]; + uint8_t name[16]; + uint8_t type; #define JMICRON_T_RAID0 0 #define JMICRON_T_RAID1 1 #define JMICRON_T_RAID01 2 #define JMICRON_T_CONCAT 3 #define JMICRON_T_RAID5 5 - u_int8_t stripe_shift; - u_int16_t flags; + uint8_t stripe_shift; + uint16_t flags; #define JMICRON_F_READY 0x0001 #define JMICRON_F_BOOTABLE 0x0002 #define JMICRON_F_BADSEC 0x0004 @@ -82,13 +82,13 @@ struct jmicron_raid_conf { #define JMICRON_F_UNSYNC 0x0020 #define JMICRON_F_NEWEST 0x0040 - u_int8_t filler_3[4]; - u_int32_t spare[JMICRON_MAX_SPARE]; - u_int32_t disks[JMICRON_MAX_DISKS]; + uint8_t filler_3[4]; + uint32_t spare[JMICRON_MAX_SPARE]; + uint32_t disks[JMICRON_MAX_DISKS]; #define JMICRON_DISK_MASK 0xFFFFFFF0 #define JMICRON_SEG_MASK 0x0000000F - u_int8_t filler_4[32]; - u_int8_t filler_5[384]; + uint8_t filler_4[32]; + uint8_t filler_5[384]; }; struct g_raid_md_jmicron_perdisk {