svn commit: r348070 - head/sys/sys

[Konstantin Belousov]

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).