From owner-svn-src-all@FreeBSD.ORG Sun Nov 25 16:22:01 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5504AB30; Sun, 25 Nov 2012 16:22:01 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) by mx1.freebsd.org (Postfix) with ESMTP id C96F18FC1B; Sun, 25 Nov 2012 16:22:00 +0000 (UTC) Received: from tom.home (localhost [127.0.0.1]) by kib.kiev.ua (8.14.5/8.14.5) with ESMTP id qAPGLq5R004822; Sun, 25 Nov 2012 18:21:52 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.7.1 kib.kiev.ua qAPGLq5R004822 Received: (from kostik@localhost) by tom.home (8.14.5/8.14.5/Submit) id qAPGLqq4004821; Sun, 25 Nov 2012 18:21:52 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 25 Nov 2012 18:21:52 +0200 From: Konstantin Belousov To: Pawel Jakub Dawidek Subject: Re: svn commit: r243142 - in head/sys: fs/nfsclient kern sys Message-ID: <20121125162152.GA3013@kib.kiev.ua> References: <201211160825.qAG8P6v6047507@svn.freebsd.org> <20121124222408.GH1460@garage.freebsd.pl> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="KsGdsel6WgEHnImy" Content-Disposition: inline In-Reply-To: <20121124222408.GH1460@garage.freebsd.pl> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Status: No, score=0.2 required=5.0 tests=ALL_TRUSTED, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on tom.home Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Nov 2012 16:22:01 -0000 --KsGdsel6WgEHnImy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Nov 24, 2012 at 11:24:08PM +0100, Pawel Jakub Dawidek wrote: > On Fri, Nov 16, 2012 at 08:25:06AM +0000, Konstantin Belousov wrote: > > Author: kib > > Date: Fri Nov 16 08:25:06 2012 > > New Revision: 243142 > > URL: http://svnweb.freebsd.org/changeset/base/243142 > >=20 > > Log: > > In pget(9), if PGET_NOTWEXIT flag is not specified, also search the > > zombie list for the pid. This allows several kern.proc sysctls to > > report useful information for zombies. > > =20 > > Hold the allproc_lock around all searches instead of relocking it. > > Remove private pfind_locked() from the new nfs client code. > > =20 > > Requested and reviewed by: pjd > > Tested by: pho > > MFC after: 3 weeks > [...] > > @@ -364,12 +374,16 @@ pget(pid_t pid, int flags, struct proc * > > struct proc *p; > > int error; > > =20 > > + sx_slock(&allproc_lock); > > if (pid <=3D PID_MAX) > > - p =3D pfind(pid); > > + p =3D pfind_locked(pid); > > else if ((flags & PGET_NOTID) =3D=3D 0) > > - p =3D pfind_tid(pid); > > + p =3D pfind_tid_locked(pid); > > else > > p =3D NULL; > > + if (p =3D=3D NULL && (flags & PGET_NOTWEXIT) =3D=3D 0) > > + p =3D zpfind_locked(pid); > > + sx_sunlock(&allproc_lock); > > if (p =3D=3D NULL) > > return (ESRCH); >=20 > I think we should move zpfind_locked() under 'pid <=3D PID_MAX': >=20 > sx_slock(&allproc_lock); > if (pid <=3D PID_MAX) { > p =3D pfind_locked(pid); > if (p =3D=3D NULL && (flags & PGET_NOTWEXIT) =3D=3D 0) > p =3D zpfind_locked(pid); > } else if ((flags & PGET_NOTID) =3D=3D 0) { > p =3D pfind_tid_locked(pid); > } else { > p =3D NULL; > } > sx_sunlock(&allproc_lock); > if (p =3D=3D NULL) > return (ESRCH); >=20 Yes, I agree. Please remove {} for one-line blocks. --KsGdsel6WgEHnImy Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlCyRZ8ACgkQC3+MBN1Mb4jMWwCgsHJftyDD4T0q64Nfbrrnb4O7 KGIAoNJv5o1cUOxuReUv82kme48ikmZQ =sWF0 -----END PGP SIGNATURE----- --KsGdsel6WgEHnImy--