svn commit: r348276 - in stable/12/sys: kern sys
Johannes Lundberg
johalun at FreeBSD.org
Sat May 25 18:23:34 UTC 2019
Author: johalun
Date: Sat May 25 18:23:32 2019
New Revision: 348276
URL: https://svnweb.freebsd.org/changeset/base/348276
Log:
MFC r344486:
Change seq_read to seq_load to avoid namespace conflicts with lkpi
Sponsored by: iX Systems
Modified:
stable/12/sys/kern/kern_descrip.c
stable/12/sys/sys/seq.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/kern/kern_descrip.c
==============================================================================
--- stable/12/sys/kern/kern_descrip.c Sat May 25 18:03:17 2019 (r348275)
+++ stable/12/sys/kern/kern_descrip.c Sat May 25 18:23:32 2019 (r348276)
@@ -2647,7 +2647,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: stable/12/sys/sys/seq.h
==============================================================================
--- stable/12/sys/sys/seq.h Sat May 25 18:03:17 2019 (r348275)
+++ stable/12/sys/sys/seq.h Sat May 25 18:23:32 2019 (r348276)
@@ -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;
More information about the svn-src-all
mailing list