From owner-svn-src-projects@freebsd.org  Thu Jan  7 23:22:44 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 BE490A66B0D
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu,  7 Jan 2016 23:22:44 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 9049F17F8;
 Thu,  7 Jan 2016 23:22:44 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u07NMhKq091567;
 Thu, 7 Jan 2016 23:22:43 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u07NMhNU091566;
 Thu, 7 Jan 2016 23:22:43 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201601072322.u07NMhNU091566@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 7 Jan 2016 23:22:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r293394 - 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.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jan 2016 23:22:44 -0000

Author: glebius
Date: Thu Jan  7 23:22:43 2016
New Revision: 293394
URL: https://svnweb.freebsd.org/changeset/base/293394

Log:
  SF_NODISKIO is still used, but differently.

Modified:
  projects/sendfile/sys/sys/socket.h

Modified: projects/sendfile/sys/sys/socket.h
==============================================================================
--- projects/sendfile/sys/sys/socket.h	Thu Jan  7 23:18:49 2016	(r293393)
+++ projects/sendfile/sys/sys/socket.h	Thu Jan  7 23:22:43 2016	(r293394)
@@ -585,13 +585,9 @@ struct sf_hdtr {
 
 /*
  * 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	/* unused */
-#define	SF_MNOWAIT	0x00000002	/* unused */
+#define	SF_NODISKIO     0x00000001
+#define	SF_MNOWAIT	0x00000002	/* obsolete */
 #define	SF_SYNC		0x00000004
 #define	SF_NOCACHE	0x00000010
 #define	SF_FLAGS(rh, flags)	(((rh) << 16) | (flags))