From owner-svn-src-projects@FreeBSD.ORG Wed Nov 12 15:58:48 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 22DDB4B5; Wed, 12 Nov 2014 15:58:48 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F14D623E; Wed, 12 Nov 2014 15:58:47 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 02B36B968; Wed, 12 Nov 2014 10:58:47 -0500 (EST) From: John Baldwin To: Gleb Smirnoff Subject: Re: svn commit: r274395 - projects/sendfile/sys/sys Date: Wed, 12 Nov 2014 10:20:12 -0500 User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20140415; KDE/4.5.5; amd64; ; ) References: <201411111939.sABJdbsq068199@svn.freebsd.org> In-Reply-To: <201411111939.sABJdbsq068199@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201411121020.12567.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Wed, 12 Nov 2014 10:58:47 -0500 (EST) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Nov 2014 15:58:48 -0000 On Tuesday, November 11, 2014 2:39:37 pm Gleb Smirnoff wrote: > Author: glebius > Date: Tue Nov 11 19:39:36 2014 > New Revision: 274395 > URL: https://svnweb.freebsd.org/changeset/base/274395 > > Log: > Undefine SF_NODISKIO and SF_MNOWAIT. > > Modified: > projects/sendfile/sys/sys/socket.h > > Modified: projects/sendfile/sys/sys/socket.h > ============================================================================== > --- projects/sendfile/sys/sys/socket.h Tue Nov 11 19:37:17 2014 (r274394) > +++ projects/sendfile/sys/sys/socket.h Tue Nov 11 19:39:36 2014 (r274395) > @@ -600,9 +600,13 @@ struct sf_hdtr_all { > > /* > * Sendfile-specific flag(s) > + * > + * SF_NODISKIO and SF_MNOWAIT are unused since 11.0, but we keep > + * them in header to keep applications compilable. We will try to > + * avoid to reuse their bits as long as possible. > */ > -#define SF_NODISKIO 0x00000001 > -#define SF_MNOWAIT 0x00000002 /* unused since 11.0 */ > +#define SF_NODISKIO 0x00000000 /* was 0x00000001 */ > +#define SF_MNOWAIT 0x00000000 /* was 0x00000002 */ > #define SF_SYNC 0x00000004 > #define SF_KQUEUE 0x00000008 > #define SF_NOCACHE 0x00000010 What we've done for mmap() flags is something like: #define SF_UNUSED0001 0x0000001 /* was SF_NODISKIO */ -- John Baldwin