From nobody Fri Apr 12 11:28:10 2024 X-Original-To: dev-commits-src-branches@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 4VGDp30ZWhz5HDF7; Fri, 12 Apr 2024 11:28:11 +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 4VGDp3043Yz4P8D; Fri, 12 Apr 2024 11:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712921291; 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=O5bAY5khXR6FZSjKIV6mhzzbkPBLRYrSU0YiZX0ZDGk=; b=iW4ZNMtkB+Gvm8pk3A5cUfzDKIaEI53uYjtHtOac/mYv4X3ygx/bIFMeNvS+pf/PBgGgIG 3kiyslcLfaCyNrUWJmHPrwUVhpr6oePwj88k7IDvcKIri96OL+xrsm8/COptF4ZkdCd5OM xjaX94FUnkXJ2eYsMlvNPXyRF17zt0BDqTIA6rdt3PL1deyGNRNbf+QLx8n2eKFHIwwxcE 0vihkG+FYFxfpFhq2Ztvq0mK0LZotnzkpDD5zLKCYl7/R3YnDAHHD3nqPQ4T875ERC4zc0 4zgAlYcGl1CynH9H1lF7QeBgznfZHzAhd0WZirctx3YyW+lP36IqqiH+PE+zow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712921291; a=rsa-sha256; cv=none; b=ETsSLm+q95N/AfbWB1j1f02ONaUUh8sS+w/ynOtvT0mcyFLs+VtzDFRqZCo7kq0oyOEw4i TicnSzwghbIYN0ieACTTD8svJGCjZswC++GEL1tZuQMqBh5BUQj9bgayLcqjnaPpU4FS/c YbqFjOBaJbjvIAU+dEq290TavnkoeXjZt3SIafVn6hTj+bDdDbUvM6uqbhu7yiW23KRDO5 2oNkQgKkwaI+mVK4FUrEIneWSPH2574StMJyi1l+beJB7mSoQGleAx948ljKnD1caRILxb vhzHibEkEUl6e6p5qgrCi5d55AFnOwdhW63OiWiwXqh6iPV3qOcrIpuC3fEjHw== 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=1712921291; 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=O5bAY5khXR6FZSjKIV6mhzzbkPBLRYrSU0YiZX0ZDGk=; b=fIoveO1RSs5F49lkay56BhBHqpMRn+U+Hw/gfhFn9N/csvCm3SJpxpVM/RctWXz2mpPVzY 8cP5IVdX2uft3R5jjkCgRGq624KvKRk9kjm6nV5N1tnatymnQHI6AsV2V9Ii/T9WvkfJRn +MjRYEZ34Hk96Z583ovIEm638rrxKNfsNWcIny80VA/NU2wXiJWbsaz4WgIwhakpQ8fKeN tKX7KwJRCpv7akqfqy3szcKu7YmVc3DTSzVXW0ooaTpYN3ognGYV/EEF3ea+6FX6OsSl4/ Fr8I/oVBye4lIw8VQMasY5DEWGD2tM7cWEsYcgRI6GGmmCKHd7UCqk4QbMmjxw== 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 4VGDp26nKVznFc; Fri, 12 Apr 2024 11:28:10 +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 43CBSA3w083611; Fri, 12 Apr 2024 11:28:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43CBSATn083608; Fri, 12 Apr 2024 11:28:10 GMT (envelope-from git) Date: Fri, 12 Apr 2024 11:28:10 GMT Message-Id: <202404121128.43CBSATn083608@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: f0edd08b27d7 - stable/13 - LinuxKPI: Remove the temporary variable fileid from the macro request_module List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f0edd08b27d78a27a05e16c894a4cafa1fc386e3 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f0edd08b27d78a27a05e16c894a4cafa1fc386e3 commit f0edd08b27d78a27a05e16c894a4cafa1fc386e3 Author: Zhenlei Huang AuthorDate: 2024-04-05 16:26:09 +0000 Commit: Zhenlei Huang CommitDate: 2024-04-12 11:27:13 +0000 LinuxKPI: Remove the temporary variable fileid from the macro request_module The variable fileid stores the result from kern_kldload() but never gets used. Since the third parameter `*fileid` of kern_kldload() can be NULL, this unused variable can be safely removed. No functional change intended. Reviewed by: emaste, bz, #linuxkpi MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44583 (cherry picked from commit 317cc829ee227cfdffe7b25125c070112ce0c2f1) (cherry picked from commit d4d5aed66a3f4323cf23f1a849b98d8570b403bf) --- sys/compat/linuxkpi/common/include/linux/kmod.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kmod.h b/sys/compat/linuxkpi/common/include/linux/kmod.h index 278d64db9df3..b3cbe2ed2e02 100644 --- a/sys/compat/linuxkpi/common/include/linux/kmod.h +++ b/sys/compat/linuxkpi/common/include/linux/kmod.h @@ -39,9 +39,8 @@ #define request_module(...) \ ({\ char modname[128]; \ - int fileid; \ snprintf(modname, sizeof(modname), __VA_ARGS__); \ - kern_kldload(curthread, modname, &fileid); \ + kern_kldload(curthread, modname, NULL); \ }) #define request_module_nowait request_module