From nobody Wed Dec 06 15:36:38 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 4SlhMp301nz53bB6; Wed, 6 Dec 2023 15:36:38 +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 4SlhMp2QxRz4NtS; Wed, 6 Dec 2023 15:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701876998; 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=iDNXhjR8n7y6umJ5hymb6vuJ54j/PjO12cI2TJdTbus=; b=gTi0g5TqkOODA9hwNlC0o26PaECRFJX9Kk0//RnLVZTnvvn+CvvbNBnYD8Y8eirDTS2nY6 MLAgbwf0Dxihw2cr9xsMMo5mg1L2oR8lj3p18aHoKBe2x6U6zuHH77cuAR2774GUo55Wzv Wx8SmtNFqEq21fZMvaPEYwjZWihcs5NhMrNQlbLdAODcLqODPAx1SRIxTqoLqIaoN2vYvA Ub1/tyLIMPChqfP2KIutwici8CaJzXJ6EiapUQ4PKju0adQInq/u4uH2A5bHpuqMqW7kqc wE39U7DYvP8auK3NujL0XhZ1YjKFVGPSgaLNmcrBBLD9ILtEdVhPx4YxIJRmFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701876998; a=rsa-sha256; cv=none; b=yn1ydFWC6OdunpvCw8AFpyv09uZ/k9ALFJ3uLO2S1KLekFnMFkh9lJXxe9O+wOclP3qVvQ c/LB1+4FnOADpHp/edO5surjFq+6co5vm36qf6wXGKFJ4zO5t5oxIcDp7Pyh4rIjnE9u1y 11iRYNOyrA+9mACfwecKvSLyXJ5V1rt3iNa4O/zt5u716+vhufyfFvEsV1m4FW3+uPK4O6 uhbw4jcH7n0B7kfAEMz/fUk/apeylL0Cj/0cjq/jDR9JhExnHG5788jFbfKzSDfHysLq8e PvaV/v/TvTO2SdqjnOT8d5e5PSsmTl7Tq+YnaGNOYR2D4rUpJW0LyAEAJmE42Q== 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=1701876998; 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=iDNXhjR8n7y6umJ5hymb6vuJ54j/PjO12cI2TJdTbus=; b=gaq7eyybp/ekRUha4S8VKTptgzW9/CZxFsc9nJ+qzmaZy5fp7m+/wNTyuIWKjOtZvACQIE ziDVn/tnJQkcAZuHmj2H3wD7fFVvWJJq5nhHIriziDxy4t/wthNeqyXpjet5+1gQbPxCmw zN0KYH0KXeCOpZ9EwyEa87Wk3b+SgRFPS5BwlbZ8qc5/yGl0hnmrknPphKeyq3Z3EgalZL AUFuHjX8PMsaqfgQFF3BxEG755fa9blHVTHKcZwtfW5x8W57q9GD85OksO5zz2GGwV1p0j IUWQkm33Y08SuCISePcWTaahw/Fd1zrzmxYzUzpGMeM1pFHsSrfMHOclQEAVtw== 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 4SlhMp1VpYzysM; Wed, 6 Dec 2023 15:36:38 +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 3B6FacrW035882; Wed, 6 Dec 2023 15:36:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6Fac6g035879; Wed, 6 Dec 2023 15:36:38 GMT (envelope-from git) Date: Wed, 6 Dec 2023 15:36:38 GMT Message-Id: <202312061536.3B6Fac6g035879@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 3a8271dc1d77 - stable/14 - CAM: Remove return value from xpt_path_sbuf() 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3a8271dc1d77990861d30eaac0aa626de1c53053 Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=3a8271dc1d77990861d30eaac0aa626de1c53053 commit 3a8271dc1d77990861d30eaac0aa626de1c53053 Author: Alexander Motin AuthorDate: 2023-11-22 20:10:57 +0000 Commit: Alexander Motin CommitDate: 2023-12-06 15:34:38 +0000 CAM: Remove return value from xpt_path_sbuf() It is wrong to call sbuf_len() on third-party sbuf. If that sbuf has a drain function, it ends up in assertion. But even would it work, it would return not newly written length, but the full one. Searching through the sources I don't see this value used. (cherry picked from commit 6332e0f1a4b34707654d6ae2cd3c1e8799970d0b) --- sys/cam/cam_xpt.c | 11 ++++------- sys/cam/cam_xpt.h | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index c32cad2433b1..26e656fc5ff2 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -3746,19 +3746,18 @@ xpt_print(struct cam_path *path, const char *fmt, ...) sbuf_delete(&sb); } -int +char * xpt_path_string(struct cam_path *path, char *str, size_t str_len) { struct sbuf sb; - int len; sbuf_new(&sb, str, str_len, 0); - len = xpt_path_sbuf(path, &sb); + xpt_path_sbuf(path, &sb); sbuf_finish(&sb); - return (len); + return (str); } -int +void xpt_path_sbuf(struct cam_path *path, struct sbuf *sb) { @@ -3789,8 +3788,6 @@ xpt_path_sbuf(struct cam_path *path, struct sbuf *sb) else sbuf_printf(sb, "X): "); } - - return(sbuf_len(sb)); } path_id_t diff --git a/sys/cam/cam_xpt.h b/sys/cam/cam_xpt.h index 1276dd7b9b2e..dfedc1157e51 100644 --- a/sys/cam/cam_xpt.h +++ b/sys/cam/cam_xpt.h @@ -103,9 +103,9 @@ int xpt_path_comp(struct cam_path *path1, struct cam_path *path2); int xpt_path_comp_dev(struct cam_path *path, struct cam_ed *dev); -int xpt_path_string(struct cam_path *path, char *str, +char * xpt_path_string(struct cam_path *path, char *str, size_t str_len); -int xpt_path_sbuf(struct cam_path *path, struct sbuf *sb); +void xpt_path_sbuf(struct cam_path *path, struct sbuf *sb); path_id_t xpt_path_path_id(struct cam_path *path); target_id_t xpt_path_target_id(struct cam_path *path); lun_id_t xpt_path_lun_id(struct cam_path *path);