From owner-svn-src-projects@FreeBSD.ORG Tue Nov 11 19:39:37 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 7D5E89B7; Tue, 11 Nov 2014 19:39:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 6A3F312D; Tue, 11 Nov 2014 19:39:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sABJdbir068200; Tue, 11 Nov 2014 19:39:37 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sABJdbsq068199; Tue, 11 Nov 2014 19:39:37 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411111939.sABJdbsq068199@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 11 Nov 2014 19:39:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274395 - projects/sendfile/sys/sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Tue, 11 Nov 2014 19:39:37 -0000 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