From nobody Wed Nov 24 21:16:32 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 ACCC318A1F55; Wed, 24 Nov 2021 21:16:32 +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 4Hzv2S2kF8z3p75; Wed, 24 Nov 2021 21:16:32 +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 3DCDE1154D; Wed, 24 Nov 2021 21:16:32 +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 1AOLGWft009152; Wed, 24 Nov 2021 21:16:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AOLGWDU009151; Wed, 24 Nov 2021 21:16:32 GMT (envelope-from git) Date: Wed, 24 Nov 2021 21:16:32 GMT Message-Id: <202111242116.1AOLGWDU009151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 74a0e24f0797 - main - linux: plug set-but-not-unused vars 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74a0e24f07974b4d51c57afa7525b5f88574ad31 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637788592; 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=y90WVCHNEpXQQI9GjIthGBr1vmJ2VN2KtTMcCqw6U80=; b=sFh7jo0zeiGJQ6UuFWUNz9hP8ieLh6GNY/Rme+DiVfO2B/bH2yORPlm43YtkxaLM/DCWLe QUq7u6a0CICHxiN2QrSTsqVsXXA1IpPj8vKPZC5fiuwNmnOKPeK7K/1IEUrS5Qvv9OnmlB KbAc+G0Ee7Kh/JECZyX6l6UbUJMZHJmD+fopY/mUHPfw1tAMFKPxfFSoHHWx3ZsCDAuI+o ykm+sENd4+/tNFkdztC4ZtiAsf9f2w66awcftdEMpO0C1/HRLZPxWdeaTYBRP+1AMWa/w2 vumf2EVMVFYsgUuWv3Nslx0HKYlTqhtQ3C9gmfK7WCjR8H4ltJ3zmNADkj9Hvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637788592; a=rsa-sha256; cv=none; b=UYCsmifANnKqWiQ4jWzfsrQPrnyDscDGO4O+HTctMLui7RU3Z6aSewX2KVpif8jjt6qAPA 4HNhskCeJNBm7/5zBtz3vZn2Vuqold0SU0Uorz68gqFmXvdLlQDH3Msv5C/Wo8lv0GTICk zGqY5HLs8l4MOYEY8KoDT3ViNKrIyvwo8zyyDUSvtt8dkSzsIRLTiJHkTHlffVCxSHGNVi LIH621Jwb09h69n//SP2lSRff2SZxYUv47gc5tHNgTIg5InzwKo63jGES6WMiWjO1iClTz ufyWnr9HvngMNOwEMft1DX8my2K/Kh5Di102cxC8v6qXCvEhvN/V7oM5XSVjDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=74a0e24f07974b4d51c57afa7525b5f88574ad31 commit 74a0e24f07974b4d51c57afa7525b5f88574ad31 Author: Mateusz Guzik AuthorDate: 2021-11-24 21:16:03 +0000 Commit: Mateusz Guzik CommitDate: 2021-11-24 21:16:03 +0000 linux: plug set-but-not-unused vars Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/compat/linux/linux_emul.c | 9 +++++---- sys/compat/linux/linux_event.c | 2 -- sys/compat/linux/linux_misc.c | 2 -- sys/compat/linux/linux_mmap.c | 2 -- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c index 86688d50c8a8..83c82fc84fee 100644 --- a/sys/compat/linux/linux_emul.c +++ b/sys/compat/linux/linux_emul.c @@ -363,12 +363,13 @@ void linux_schedtail(struct thread *td) { struct linux_emuldata *em; - struct proc *p; - int error = 0; +#ifdef KTR + int error; +#else + int error __unused; +#endif int *child_set_tid; - p = td->td_proc; - em = em_find(td); KASSERT(em != NULL, ("linux_schedtail: thread emuldata not found.\n")); child_set_tid = em->child_set_tid; diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index 2539b406618f..fa6ebc366ae9 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -615,7 +615,6 @@ linux_eventfd2(struct thread *td, struct linux_eventfd2_args *args) int linux_timerfd_create(struct thread *td, struct linux_timerfd_create_args *args) { - struct filedesc *fdp; struct timerfd *tfd; struct file *fp; clockid_t clockid; @@ -634,7 +633,6 @@ linux_timerfd_create(struct thread *td, struct linux_timerfd_create_args *args) if ((args->flags & LINUX_TFD_CLOEXEC) != 0) fflags |= O_CLOEXEC; - fdp = td->td_proc->p_fd; error = falloc(td, &fp, &fd, fflags); if (error != 0) return (error); diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 5ae4051aaf38..589ad911266f 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -1087,7 +1087,6 @@ linux_waitid(struct thread *td, struct linux_waitid_args *args) siginfo_t siginfo; l_siginfo_t lsi; idtype_t idtype; - struct proc *p; int error; options = 0; @@ -1127,7 +1126,6 @@ linux_waitid(struct thread *td, struct linux_waitid_args *args) return (error); } if (args->info != NULL) { - p = td->td_proc; bzero(&lsi, sizeof(lsi)); if (td->td_retval[0] != 0) { sig = bsd_to_linux_signal(siginfo.si_signo); diff --git a/sys/compat/linux/linux_mmap.c b/sys/compat/linux/linux_mmap.c index d7f12b782e96..af2ccc74ba12 100644 --- a/sys/compat/linux/linux_mmap.c +++ b/sys/compat/linux/linux_mmap.c @@ -83,14 +83,12 @@ linux_mmap_common(struct thread *td, uintptr_t addr, size_t len, int prot, struct proc *p = td->td_proc; struct vmspace *vms = td->td_proc->p_vmspace; int bsd_flags, error; - struct file *fp; LINUX_CTR6(mmap2, "0x%lx, %ld, %ld, 0x%08lx, %ld, 0x%lx", addr, len, prot, flags, fd, pos); error = 0; bsd_flags = 0; - fp = NULL; /* * Linux mmap(2):