From owner-svn-src-all@freebsd.org Sat Jan 21 21:36:22 2017 Return-Path: Delivered-To: svn-src-all@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 1B880CBAB23; Sat, 21 Jan 2017 21:36:22 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B6A55120D; Sat, 21 Jan 2017 21:36:21 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-wm0-x243.google.com with SMTP id r126so15927932wmr.3; Sat, 21 Jan 2017 13:36:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=0whhwIqH+H2+J8SVr7slJuEqP0Y3rth1cuZUk3MPRvc=; b=K8aEcx6BP5b8GBO33PWHATQp+SdeWxy1qJ2pzIqWZ7sC+nJk8Fn297DqntYX0AB1j7 OUxZCQJFGTrmuyOROPIYFItTxKGpPIFbWQn1iaA9ucaR7ay+2NRVeugJ7MUj2x89mA82 pob00k/62oQejhyvEpxebovkHIV8esOzbjB8IjXxnoPBPrK2kpsot6k/p5QYmd0JshTl 89HFlsmjo/ejPaMdIJ5QfDaxSPdsG/8W9tXhByhogp6vbeKCNcs5XaPuRBYNS0vjkIMd jw3A+mh/FJz/H/wl9cy4W+tXKq57C2G8lG0H9EtXjBFx6gxKkMdNOU7S03w/pztADrZ4 P/wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=0whhwIqH+H2+J8SVr7slJuEqP0Y3rth1cuZUk3MPRvc=; b=P1ejX4CMqKOCXV09XePL7dj3pxEjP1MyEhXsLzUmgGKZXyIYSTIyLNTODvkLRe+TeR eWXSWG8FBvgeEbwppLxxFSy58cTipO3zajP/Bw/jvtfK8Nop/WvFYWxZO3e+UN5ol6wJ 2heG088FARB38eGb4T0ab4AIkYTygYtNuMOE3o+G7sS4VaPylPzWDi0SkghnJ0alZq7A NaG9Y9n1BgTQ+0u8O2bW4CL4lA2iqwdNglW6ghNpzsPVe4XywCRAeUGuuvR5h4sV+fqu br3wHjE61Mw0Jy2VzhVy1UJLgYHdQ49fSQeEIukdc3puZ0OHqVxNI4ihpzr90zDtjYwn z/hQ== X-Gm-Message-State: AIkVDXLCmSiPus0VFLZLR+cXAlrOorwUsP7LXx6/d8kw0V/Z0tCDGmfBkO83PQa/m+ZbWA== X-Received: by 10.28.191.139 with SMTP id o11mr8949837wmi.97.1485034579201; Sat, 21 Jan 2017 13:36:19 -0800 (PST) Received: from dft-labs.eu (n1x0n-1-pt.tunnel.tserv5.lon1.ipv6.he.net. [2001:470:1f08:1f7::2]) by smtp.gmail.com with ESMTPSA id a35sm6248065wra.21.2017.01.21.13.36.17 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Sat, 21 Jan 2017 13:36:17 -0800 (PST) Date: Sat, 21 Jan 2017 22:36:15 +0100 From: Mateusz Guzik To: Konstantin Belousov Cc: Mateusz Guzik , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r312600 - head/sys/kern Message-ID: <20170121213614.GB20930@dft-labs.eu> References: <201701211838.v0LIcHIv072626@repo.freebsd.org> <20170121195114.GA2349@kib.kiev.ua> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20170121195114.GA2349@kib.kiev.ua> User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Sat, 21 Jan 2017 21:36:22 -0000 On Sat, Jan 21, 2017 at 09:51:14PM +0200, Konstantin Belousov wrote: > On Sat, Jan 21, 2017 at 06:38:17PM +0000, Mateusz Guzik wrote: > > + if (flags & LK_RETRY) { > Stylish test is > if ((flags & LK_RETRY) != 0) { > > + if ((error != 0)) > Too many (). > > > + goto retry; > > + if ((vp->v_iflag & VI_DOOMED)) { > Too many braces again, or missed != 0. This was a side effect of putting these into __predict_false and then removing it, albeit not fully. > > VOP_UNLOCK(vp, 0); > > error = ENOENT; > > - break; > Also, this does the functional change, it seems to completely break LK_RERY > logic. If LK_RETRY is specified, VI_DOOMED must not result in ENOENT. > Yea, this was a weird-ass brainfart on my part. Fixed in r312606 The gist of the actual change I wanted to make is postponing the read from the vnode. > > } > > - } while (flags & LK_RETRY && error != 0); > > + } > > return (error); > > } > > -- Mateusz Guzik