svn commit: r344486 - in head/sys: kern sys

[Matt Macy]

Author: mmacy
Date: Sat Feb 23 21:04:48 2019
New Revision: 344486
URL: https://svnweb.freebsd.org/changeset/base/344486

Log:
  Change seq_read to seq_load to avoid namespace conflicts with lkpi
  
  MFC after:	1 week
  Sponsored by:	iX Systems

Modified:
  head/sys/kern/kern_descrip.c
  head/sys/sys/seq.h

Modified: head/sys/kern/kern_descrip.c
==============================================================================
--- head/sys/kern/kern_descrip.c	Sat Feb 23 20:56:41 2019	(r344485)
+++ head/sys/kern/kern_descrip.c	Sat Feb 23 21:04:48 2019	(r344486)
@@ -2629,7 +2629,7 @@ fget_unlocked(struct filedesc *fdp, int fd, cap_rights
 	 */
 	for (;;) {
 #ifdef CAPABILITIES
-		seq = seq_read(fd_seq(fdt, fd));
+		seq = seq_load(fd_seq(fdt, fd));
 		fde = &fdt->fdt_ofiles[fd];
 		haverights = *cap_rights_fde_inline(fde);
 		fp = fde->fde_file;

Modified: head/sys/sys/seq.h
==============================================================================
--- head/sys/sys/seq.h	Sat Feb 23 20:56:41 2019	(r344485)
+++ head/sys/sys/seq.h	Sat Feb 23 21:04:48 2019	(r344486)
@@ -121,7 +121,7 @@ seq_write_end(seq_t *seqp)
 }
 
 static __inline seq_t
-seq_read(const seq_t *seqp)
+seq_load(const seq_t *seqp)
 {
 	seq_t ret;