From nobody Sun Sep 17 14:42:22 2023 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 4RpVy72vKbz4sxMr; Sun, 17 Sep 2023 14:42:23 +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 4RpVy70zcKz3dxr; Sun, 17 Sep 2023 14:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694961743; 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=O/Tl9vviQploEcuR+aZe1VCQhNTumgvuiHLYl4qqRQM=; b=SDDNsE+JPo6/uDHe+UTzl2mVhpSJAAiTnZGXgxRQ4ChSdXuItcaaqlOa5ddXkrpB/2vsO3 kyNieCICtpB6o7WPxhW0cEXwvbd+ytRqr/J4bLCxNmUn9NKl8JC2AscG5b8xI3PU+/32wM PBnGMOLsMlomQdbFFkO8vFk0a59sUuhPa68YjkMHEJj2P7k/ktjtPPWAN2BUecxqcSUt7f wk6/qkuOiIKsFXr0I3W9wBiaCkskAgneBXTPCpZPERaA0YNJOQF0ojmDz70UA4EEplSHib 4epEhBAQvNLqqNqz9Fxygbn90OPCt3sGI5tY3L+WV68fu9POhHEaRZZMWSuFZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694961743; a=rsa-sha256; cv=none; b=lIUtVwF7bPIg8jsxIfM17OQ38B7AkO1GMuBcSwR0/wb6b/bEa87mpcCZb9W5IgN7IhnV7B ocXNe6gFRquFzeFVi42FvS4DRj269TwGAeInfW3tIqnjvvUJB7vv5AGuxsP2qyDnH8v8Co SG2PeTxCu4o+kDLdSBecH/bH3oVwfDm1hLbUwrYLY1dl45ZRTkXVmUqU1HArOQ50tjUbl0 DbT55spVRctW5Q66qqn+r00S+sfJjNtI/Tn9tsw193nyrSRCa5tIahYWbFNICTVhhI6XXG nGIsWpw9cgBwHhBRVuIqTFnMLhUpwDvf2Dyn7JfmO9zFYsNUjY7jgZAFQPoq4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694961743; 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=O/Tl9vviQploEcuR+aZe1VCQhNTumgvuiHLYl4qqRQM=; b=LU//y8Vopfvj6bJnVm+WYGcrBNgtltKmcrobsb26k288H1mxwpo0oCS1QI5ul8HuV8JlK/ ODhumDFe5ChCM/GElk4jdsjc7tYb6pOxqUlf1heDsgF5pw32/PxZaK7/0GDfrrG/GLW1vn SCTbryf2djxJyn6XSpBB75JrorgpwmfW3tEj4sGVnbAZZRQlLouWpvd/XjZ7VUVWASHaMy 1ymVeo4xx6U1zeTaGHfXbE2TL46BXnIIuhecwB6uKO4+gkaSxOA0w4UaylTWDcXMIaqcAJ T0La7w8eYpOFvcuuHIYhCcMuinBXHh0voxjZB3cs9lVf3cFkW5sXWgbfBRmGmQ== 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 4RpVy704wFzspb; Sun, 17 Sep 2023 14:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HEgM98036433; Sun, 17 Sep 2023 14:42:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HEgM0T036430; Sun, 17 Sep 2023 14:42:22 GMT (envelope-from git) Date: Sun, 17 Sep 2023 14:42:22 GMT Message-Id: <202309171442.38HEgM0T036430@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 67e1423099ab - stable/14 - smartpqi: Fix build issues highlighted by gcc12 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 67e1423099ab55de9d3b18a4ad54b1c623383d42 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=67e1423099ab55de9d3b18a4ad54b1c623383d42 commit 67e1423099ab55de9d3b18a4ad54b1c623383d42 Author: Warner Losh AuthorDate: 2023-08-25 15:45:28 +0000 Commit: Warner Losh CommitDate: 2023-09-17 14:34:40 +0000 smartpqi: Fix build issues highlighted by gcc12 Make inline functions defined in a header file as static inline. Mark inline functions used only in the compilation unit they are defined in as merely static (the compiler can figure out it these days). Sponsored by: Netflix (cherry picked from commit 2f06449d64298fe508e3c585b45effd69a72d696) Approved by: re (cperciva@) --- sys/dev/smartpqi/smartpqi_helper.c | 12 ------------ sys/dev/smartpqi/smartpqi_helper.h | 8 ++++---- sys/dev/smartpqi/smartpqi_prototypes.h | 4 ---- sys/dev/smartpqi/smartpqi_request.c | 6 +++--- 4 files changed, 7 insertions(+), 23 deletions(-) diff --git a/sys/dev/smartpqi/smartpqi_helper.c b/sys/dev/smartpqi/smartpqi_helper.c index 68f105001fa0..741ac0a05a06 100644 --- a/sys/dev/smartpqi/smartpqi_helper.c +++ b/sys/dev/smartpqi/smartpqi_helper.c @@ -416,18 +416,6 @@ check_device_pending_commands_to_complete(pqisrc_softstate_t *softs, pqi_scsi_de } #endif -extern inline uint64_t -pqisrc_increment_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device); - -extern inline uint64_t -pqisrc_decrement_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device); - -extern inline void -pqisrc_init_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device); - -extern inline uint64_t -pqisrc_read_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device); - void pqisrc_wait_for_device_commands_to_complete(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) { diff --git a/sys/dev/smartpqi/smartpqi_helper.h b/sys/dev/smartpqi/smartpqi_helper.h index cc7030de74ad..507caeb9b0b6 100644 --- a/sys/dev/smartpqi/smartpqi_helper.h +++ b/sys/dev/smartpqi/smartpqi_helper.h @@ -28,7 +28,7 @@ #define _PQI_HELPER_H -inline uint64_t +static inline uint64_t pqisrc_increment_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) { #if PQISRC_DEVICE_IO_COUNTER @@ -37,7 +37,7 @@ pqisrc_increment_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *dev #endif } -inline uint64_t +static inline uint64_t pqisrc_decrement_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) { #if PQISRC_DEVICE_IO_COUNTER @@ -46,7 +46,7 @@ pqisrc_decrement_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *de #endif } -inline void +static inline void pqisrc_init_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) { #if PQISRC_DEVICE_IO_COUNTER @@ -55,7 +55,7 @@ pqisrc_init_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) #endif } -inline uint64_t +static inline uint64_t pqisrc_read_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) { #if PQISRC_DEVICE_IO_COUNTER diff --git a/sys/dev/smartpqi/smartpqi_prototypes.h b/sys/dev/smartpqi/smartpqi_prototypes.h index 8eabe5c47cf4..a10e5031d85e 100644 --- a/sys/dev/smartpqi/smartpqi_prototypes.h +++ b/sys/dev/smartpqi/smartpqi_prototypes.h @@ -167,10 +167,6 @@ int pqisrc_send_tmf(pqisrc_softstate_t *, pqi_scsi_dev_t *, rcb_t *, rcb_t *, int); int pqisrc_write_current_time_to_host_wellness(pqisrc_softstate_t *softs); int pqisrc_write_driver_version_to_host_wellness(pqisrc_softstate_t *softs); -extern inline void pqisrc_aio_build_cdb(aio_req_locator_t *, uint32_t, - rcb_t *, uint8_t *); -extern inline boolean_t pqisrc_aio_req_too_big(pqisrc_softstate_t *, pqi_scsi_dev_t *, - rcb_t *, aio_req_locator_t *, uint32_t); void pqisrc_build_aio_common(pqisrc_softstate_t *, pqi_aio_req_t *, rcb_t *, uint32_t); void pqisrc_build_aio_R1_write(pqisrc_softstate_t *, diff --git a/sys/dev/smartpqi/smartpqi_request.c b/sys/dev/smartpqi/smartpqi_request.c index 246ab891126d..1c0bbc2a1db5 100644 --- a/sys/dev/smartpqi/smartpqi_request.c +++ b/sys/dev/smartpqi/smartpqi_request.c @@ -1180,7 +1180,7 @@ fill_lba_for_scsi_rw(pqisrc_softstate_t *softs, uint8_t *cdb, aio_req_locator_t /* determine whether writes to certain types of RAID are supported. */ -inline boolean_t +static boolean_t pqisrc_is_supported_write(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) { @@ -1492,7 +1492,7 @@ pqisrc_handle_blk_size_diffs(aio_req_locator_t *l) * handle based on dev type, Raid level, and encryption status. * TODO: make limits dynamic when this becomes possible. */ -inline boolean_t +static boolean_t pqisrc_aio_req_too_big(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device, rcb_t *rcb, aio_req_locator_t *l, uint32_t disk_blk_cnt) @@ -1636,7 +1636,7 @@ pqisrc_aio_show_locator_info(pqisrc_softstate_t *softs, } /* build the aio cdb */ -inline void +static void pqisrc_aio_build_cdb(aio_req_locator_t *l, uint32_t disk_blk_cnt, rcb_t *rcb, uint8_t *cdb) {