Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Jun 2022 19:37:41 GMT
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 1735342c9065 - stable/13 - linux(4): style, wrap too long line.
Message-ID:  <202206171937.25HJbfGF013688@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by dchagin:

URL: https://cgit.FreeBSD.org/src/commit/?id=1735342c90650be87a529e825ea797e4e6548184

commit 1735342c90650be87a529e825ea797e4e6548184
Author:     Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2021-07-29 09:53:07 +0000
Commit:     Dmitry Chagin <dchagin@FreeBSD.org>
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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206171937.25HJbfGF013688>