From nobody Fri Jun 17 19:37:41 2022 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 6AC8385AB8C; Fri, 17 Jun 2022 19:37:42 +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 4LPq7p1vZ8z3Pwn; Fri, 17 Jun 2022 19:37:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494662; 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=Js5W4cNyg1NB+wOpzI6UrwQ8LRt7LR/Ye/JuFu+keYA=; b=xz3RFVcXu3RHpOl5KElL26QTSTa7WzYSUz/8Cb4UGzZHuSUZw/8XBxs8FaMuWWYXEUS+MJ yUWdaAv9Gf8GZZUy7673C4OWiKtspaOtVOHXwvDFl0XFMfXQP/wBIzfyR3yAybxm5h42PB HeWl11yAiRoyrioj1jgnOpxfaJZk0UMAfzcnYKwewMFLshpBCbc/8LGhaUdvCbGAFfcSxQ bLdNrh8LZxCD00YpSYxCZw/YPqEG8o7qb3qrCzOLmw32YKEvwXnFT/ShWHLMBO2oddcUuP G1vKOabB/NlugaD47wvPpuI3hm2sdjoAvJW4jd671zxHvVR5zYDr9O1i50YCTQ== 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 9F46D25C3C; Fri, 17 Jun 2022 19:37:41 +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 25HJbfWp013689; Fri, 17 Jun 2022 19:37:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJbfGF013688; Fri, 17 Jun 2022 19:37:41 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:37:41 GMT Message-Id: <202206171937.25HJbfGF013688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 1735342c9065 - stable/13 - linux(4): style, wrap too long line. 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: Sender: owner-dev-commits-src-branches@freebsd.org 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1735342c90650be87a529e825ea797e4e6548184 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494662; 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=Js5W4cNyg1NB+wOpzI6UrwQ8LRt7LR/Ye/JuFu+keYA=; b=LKgbFfpeVx4+C/l7AwKEPQgaz3hDZjuJX+So2KUsDwECiVHEshlUpZra2BUtvocP4ejGkD h4UVGRX4FrgJH9IDNhfsVIAubbKb4O9xW3225mPS/fBNRfpvS1RXljYxOMV8UxHrDZMTST 8i9svuE0KyEr5cSvEXrxG7YN+mjmPVz4b5SO2+kO2HcxMiIyQw31GEdzCu8+HqhPp8lhou hLEGslmOYuBBtAiQSJCg4S26Sb+XIGZe8WY9aRqBlDUu5zHDAbmesDq0VXJ0LVUPTEFswW f5S8nbvfvhvBa5vjfJz5xSJXOuIMYwSR83wMYSF63A2jOEOlRVjiP/6iX/3uSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494662; a=rsa-sha256; cv=none; b=Uj8KQOmDeBqi+Ruaee7+PzdqDmDGVdXIRafNcFLw69MiwSO9927cufzv/Grpik/jqzk7P+ 9qFxtF5BVN/kWfzbTfPq6UwHDYFSXQst5gxshGtWeqFl/O8T1aNln9nR4WHs1TyunNqEXM DYxSlnBrAVsnA4D7mNCRXSEOz7Berc4qEy3Eo3kQYzJGJaeqGZS5fnXoUHA3O+W5KvgrLF fSjgPZHoV/oB8ZrGLrkpO11WmtcqwS1PsRNIAS7c+2xQKtjB4sywT7MsTqcBFmXALlYpdR RnFXWhJDmbTjzwBIV7MbA9FiN4NGecwZZmCvqYQjG6DPcQlVtO/W5kUMER0cQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=1735342c90650be87a529e825ea797e4e6548184 commit 1735342c90650be87a529e825ea797e4e6548184 Author: Dmitry Chagin AuthorDate: 2021-07-29 09:53:07 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:22 +0000 linux(4): style, wrap too long line. MFC after: 2 weeks (cherry picked from commit 971b53fa04f96199889f6dd6a078d054772bc7c9) --- sys/compat/linux/linux_futex.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index 510b43f11ca4..f26a4edc7311 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -925,7 +925,7 @@ linux_get_robust_list(struct thread *td, struct linux_get_robust_list_args *args } error = copyout(&len, args->len, sizeof(l_size_t)); - if (error) + if (error != 0) return (EFAULT); return (copyout(&head, args->head, sizeof(head))); @@ -1001,7 +1001,7 @@ fetch_robust_entry(struct linux_robust_list **entry, int error; error = copyin((const void *)head, &uentry, sizeof(l_ulong)); - if (error) + if (error != 0) return (EFAULT); *entry = (void *)(uentry & ~1UL); @@ -1022,10 +1022,9 @@ release_futexes(struct thread *td, struct linux_emuldata *em) unsigned int limit = 2048, pi, next_pi, pip; uint32_t *uaddr; l_long futex_offset; - int rc, error; + int error; head = em->robust_futexes; - if (head == NULL) return; @@ -1034,14 +1033,15 @@ release_futexes(struct thread *td, struct linux_emuldata *em) error = copyin(&head->futex_offset, &futex_offset, sizeof(futex_offset)); - if (error) + if (error != 0) return; if (fetch_robust_entry(&pending, PTRIN(&head->pending_list), &pip)) return; while (entry != &head->list) { - rc = fetch_robust_entry(&next_entry, PTRIN(&entry->next), &next_pi); + error = fetch_robust_entry(&next_entry, PTRIN(&entry->next), + &next_pi); /* * A pending lock might already be on the list, so @@ -1053,7 +1053,7 @@ release_futexes(struct thread *td, struct linux_emuldata *em) LINUX_HANDLE_DEATH_LIST)) return; } - if (rc) + if (error != 0) return; entry = next_entry;