From owner-svn-src-stable-11@freebsd.org Sat Apr 15 15:09:25 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2E727D3E381; Sat, 15 Apr 2017 15:09:25 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 09E5DF4; Sat, 15 Apr 2017 15:09:24 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3FF9Oas079780; Sat, 15 Apr 2017 15:09:24 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3FF9OFA079779; Sat, 15 Apr 2017 15:09:24 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201704151509.v3FF9OFA079779@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sat, 15 Apr 2017 15:09:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r316961 - stable/11/sys/compat/linux X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2017 15:09:25 -0000 Author: dchagin Date: Sat Apr 15 15:09:23 2017 New Revision: 316961 URL: https://svnweb.freebsd.org/changeset/base/316961 Log: MFC r314648: Style(9). Modified: stable/11/sys/compat/linux/linux_ipc.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linux/linux_ipc.c ============================================================================== --- stable/11/sys/compat/linux/linux_ipc.c Sat Apr 15 15:08:23 2017 (r316960) +++ stable/11/sys/compat/linux/linux_ipc.c Sat Apr 15 15:09:23 2017 (r316961) @@ -531,7 +531,7 @@ linux_semctl(struct thread *td, struct l cmd = IPC_SET; error = linux_semid_pullup(args->cmd & LINUX_IPC_64, &linux_semid, PTRIN(args->arg.buf)); - if (error) + if (error != 0) return (error); linux_to_bsd_semid_ds(&linux_semid, &semid); semun.buf = &semid; @@ -546,7 +546,7 @@ linux_semctl(struct thread *td, struct l semun.buf = &semid; error = kern_semctl(td, args->semid, args->semnum, cmd, &semun, &rval); - if (error) + if (error != 0) return (error); bsd_to_linux_semid_ds(&semid, &linux_semid); error = linux_semid_pushdown(args->cmd & LINUX_IPC_64, @@ -573,7 +573,7 @@ linux_semctl(struct thread *td, struct l */ error = copyout(&linux_seminfo, PTRIN(args->arg.buf), sizeof(linux_seminfo)); - if (error) + if (error != 0) return (error); td->td_retval[0] = seminfo.semmni; return (0); /* No need for __semctl call */ @@ -690,7 +690,7 @@ linux_msgctl(struct thread *td, struct l case LINUX_IPC_SET: error = linux_msqid_pullup(args->cmd & LINUX_IPC_64, &linux_msqid, PTRIN(args->buf)); - if (error) + if (error != 0) return (error); linux_to_bsd_msqid_ds(&linux_msqid, &bsd_msqid); break; @@ -788,7 +788,7 @@ linux_shmctl(struct thread *td, struct l /* Perform shmctl wanting removed segments lookup */ error = kern_shmctl(td, args->shmid, IPC_INFO, (void *)&bsd_shminfo, NULL); - if (error) + if (error != 0) return (error); bsd_to_linux_shminfo(&bsd_shminfo, &linux_shminfo); @@ -803,7 +803,7 @@ linux_shmctl(struct thread *td, struct l /* Perform shmctl wanting removed segments lookup */ error = kern_shmctl(td, args->shmid, SHM_INFO, (void *)&bsd_shm_info, NULL); - if (error) + if (error != 0) return (error); bsd_to_linux_shm_info(&bsd_shm_info, &linux_shm_info); @@ -816,9 +816,9 @@ linux_shmctl(struct thread *td, struct l /* Perform shmctl wanting removed segments lookup */ error = kern_shmctl(td, args->shmid, IPC_STAT, (void *)&bsd_shmid, NULL); - if (error) + if (error != 0) return (error); - + bsd_to_linux_shmid_ds(&bsd_shmid, &linux_shmid); return (linux_shmid_pushdown(args->cmd & LINUX_IPC_64, @@ -828,9 +828,9 @@ linux_shmctl(struct thread *td, struct l /* Perform shmctl wanting removed segments lookup */ error = kern_shmctl(td, args->shmid, IPC_STAT, (void *)&bsd_shmid, NULL); - if (error) + if (error != 0) return (error); - + bsd_to_linux_shmid_ds(&bsd_shmid, &linux_shmid); return (linux_shmid_pushdown(args->cmd & LINUX_IPC_64, @@ -839,7 +839,7 @@ linux_shmctl(struct thread *td, struct l case LINUX_IPC_SET: error = linux_shmid_pullup(args->cmd & LINUX_IPC_64, &linux_shmid, PTRIN(args->buf)); - if (error) + if (error != 0) return (error); linux_to_bsd_shmid_ds(&linux_shmid, &bsd_shmid); @@ -856,7 +856,7 @@ linux_shmctl(struct thread *td, struct l else { error = linux_shmid_pullup(args->cmd & LINUX_IPC_64, &linux_shmid, PTRIN(args->buf)); - if (error) + if (error != 0) return (error); linux_to_bsd_shmid_ds(&linux_shmid, &bsd_shmid); buf = (void *)&bsd_shmid;