From owner-svn-src-projects@FreeBSD.ORG  Sun Dec  1 20:56:04 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2893E557;
 Sun,  1 Dec 2013 20:56:04 +0000 (UTC)
Received: from mail-qa0-x22b.google.com (mail-qa0-x22b.google.com
 [IPv6:2607:f8b0:400d:c00::22b])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B70D91A09;
 Sun,  1 Dec 2013 20:56:03 +0000 (UTC)
Received: by mail-qa0-f43.google.com with SMTP id ii20so3632369qab.2
 for <multiple recipients>; Sun, 01 Dec 2013 12:56:02 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=+dzbIw7OEnaCuwJrCw7tWXa+bkVG8/AJSjCiqNR5H7Y=;
 b=V6cF1YcoeYtEdGaLh2P46nRaXRYQPBnDg/+paDJrYg2qvgnJOnSjE5RX2xBSheDqNU
 M6M2DW7SSGChsFbDDoZ0gGECEbjZkWzOkZIGhwGRpxsEAlyXe15hqYJh3F7jfCfBn/qj
 uO0Sc/8yq8hyND1F9rB0CttCSCA+96onJu4Il/FJtjLnQuy3N9SpvI6JmtjnbxSrII6O
 Wfqc8U25Rm09xuesa1hItjlhtK/9n6XSl7AyqptWPAWR8OfmkGZCSjwtVz7DbLriTMVM
 jmfFcd6aYDLc+6K0bOBvzByiLGdYlREAeUaE2vGlHWZCekO6ED9Z2C6kAN0JCBk03Tgh
 h0zw==
MIME-Version: 1.0
X-Received: by 10.229.56.200 with SMTP id z8mr107227700qcg.1.1385931362884;
 Sun, 01 Dec 2013 12:56:02 -0800 (PST)
Sender: adrian.chadd@gmail.com
Received: by 10.224.53.200 with HTTP; Sun, 1 Dec 2013 12:56:02 -0800 (PST)
In-Reply-To: <201312012032.rB1KWHTR096175@svn.freebsd.org>
References: <201312012032.rB1KWHTR096175@svn.freebsd.org>
Date: Sun, 1 Dec 2013 12:56:02 -0800
X-Google-Sender-Auth: pfGZm0bzG1biQTkB28dqsERc1oE
Message-ID: <CAJ-VmokgxoCA-aHa6Y1RdEr=3_dTwFPCQ=QXSG2bbmMp3tgsBA@mail.gmail.com>
Subject: Re: svn commit: r258813 - projects/sendfile/sys/kern
From: Adrian Chadd <adrian@freebsd.org>
To: Gleb Smirnoff <glebius@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Cc: svn-src-projects@freebsd.org,
 "src-committers@freebsd.org" <src-committers@freebsd.org>
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Dec 2013 20:56:04 -0000

Is this required for -HEAD right now?


-a

On 1 December 2013 12:32, Gleb Smirnoff <glebius@freebsd.org> wrote:
> Author: glebius
> Date: Sun Dec  1 20:32:16 2013
> New Revision: 258813
> URL: http://svnweb.freebsd.org/changeset/base/258813
>
> Log:
>   More correct code that handles sf wait logic.
>
>   Submitted by: kib
>
> Modified:
>   projects/sendfile/sys/kern/uipc_syscalls.c
>
> Modified: projects/sendfile/sys/kern/uipc_syscalls.c
> ==============================================================================
> --- projects/sendfile/sys/kern/uipc_syscalls.c  Sun Dec  1 20:03:00 2013        (r258812)
> +++ projects/sendfile/sys/kern/uipc_syscalls.c  Sun Dec  1 20:32:16 2013        (r258813)
> @@ -2564,9 +2564,7 @@ retry_space:
>                          * threads might exhaust the buffers and then
>                          * deadlock.
>                          */
> -                       if (m != NULL)
> -                               sfwait = SFB_NOWAIT;
> -                       sf = sf_buf_alloc(pg, sfwait);
> +                       sf = sf_buf_alloc(pg, m != NULL : SFB_NOWAIT ? sfwait);
>                         if (sf == NULL) {
>                                 SFSTAT_INC(sf_allocfail);
>                                 vm_page_lock(pg);