d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change seq_read to seq_load to avoid namespace conflicts with lkpi

Browse Source 
MFC after:	1 week
Sponsored by:	iX Systems
This commit is contained in:
Matt Macy 2019-02-23 21:04:48 +00:00
parent 3f6cab079c
commit ebe0b35a18
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=344486
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/kern/kern_descrip.c
View File

@ -2629,7 +2629,7 @@ fget_unlocked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp,
*/
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;

2
sys/sys/seq.h
View File

@ -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;