From owner-svn-src-head@freebsd.org  Tue May 21 23:15:51 2019
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA0F01593358;
 Tue, 21 May 2019 23:15:50 +0000 (UTC)
 (envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E6DCA8644E;
 Tue, 21 May 2019 23:15:49 +0000 (UTC)
 (envelope-from kostikbel@gmail.com)
Received: from tom.home (kib@localhost [127.0.0.1])
 by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id x4LNFgti029415
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO);
 Wed, 22 May 2019 02:15:45 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua x4LNFgti029415
Received: (from kostik@localhost)
 by tom.home (8.15.2/8.15.2/Submit) id x4LNFgDg029414;
 Wed, 22 May 2019 02:15:42 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
 using -f
Date: Wed, 22 May 2019 02:15:42 +0300
From: Konstantin Belousov <kostikbel@gmail.com>
To: Conrad Meyer <cem@FreeBSD.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: Re: svn commit: r348070 - head/sys/sys
Message-ID: <20190521231542.GX2748@kib.kiev.ua>
References: <201905212135.x4LLZbkB047361@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201905212135.x4LLZbkB047361@repo.freebsd.org>
User-Agent: Mutt/1.11.4 (2019-03-13)
X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM,
 NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.2
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on tom.home
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 May 2019 23:15:51 -0000

On Tue, May 21, 2019 at 09:35:37PM +0000, Conrad Meyer wrote:
> Author: cem
> Date: Tue May 21 21:35:37 2019
> New Revision: 348070
> URL: https://svnweb.freebsd.org/changeset/base/348070
> 
> Log:
>   sys/lockmgr.h: Update #error to point at correct _lock.h
>   
>   After r347984, these macros live in sys/_lock.h.  No functional change.
>   
>   Sponsored by:	Dell EMC Isilon
> 
> Modified:
>   head/sys/sys/lockmgr.h
> 
> Modified: head/sys/sys/lockmgr.h
> ==============================================================================
> --- head/sys/sys/lockmgr.h	Tue May 21 21:27:14 2019	(r348069)
> +++ head/sys/sys/lockmgr.h	Tue May 21 21:35:37 2019	(r348070)
> @@ -58,7 +58,7 @@
>  #ifdef _KERNEL
>  
>  #if !defined(LOCK_FILE) || !defined(LOCK_LINE)
> -#error	"LOCK_FILE and LOCK_LINE not defined, include <sys/lock.h> before"
> +#error	"LOCK_FILE and LOCK_LINE not defined, include <sys/_lock.h> before"
>  #endif
>  
>  struct thread;
I do not think that this change is good. sys/_lock.h is very special
and should be only used in specific circumstances. A consumer of the
lockmgr.h interface which needs to use _lock.h instead of lock.h already
knows that (and in fact I doubt that lockmgr.h can work with only
_lock.h included).