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

seqc: rename seqc_consistent_nomb to seqc_consistent_no_fence

Browse Source 
For more consistency with other primitives.
This commit is contained in:
Mateusz Guzik 2022-02-14 19:50:37 +01:00
parent 972a7d95eb
commit c9a995994b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/compat/linuxkpi/common/include/linux/seqlock.h
View File

@ -71,7 +71,7 @@ write_seqcount_end(struct seqcount *seqcount)
* XXX: Are predicts from inline functions still not honored by clang?
*/
#define __read_seqcount_retry(seqcount, gen) \
(!seqc_consistent_nomb(&(seqcount)->seqc, gen))
(!seqc_consistent_no_fence(&(seqcount)->seqc, gen))
#define read_seqcount_retry(seqcount, gen) \
(!seqc_consistent(&(seqcount)->seqc, gen))

6
sys/kern/kern_descrip.c
View File

@ -2941,7 +2941,7 @@ fgetvp_lookup_smr(int fd, struct nameidata *ndp, struct vnode **vpp, bool *fsear
*/
atomic_thread_fence_acq();
fdt = fdp->fd_files;
if (__predict_false(!seqc_consistent_nomb(fd_seqc(fdt, fd), seq)))
if (__predict_false(!seqc_consistent_no_fence(fd_seqc(fdt, fd), seq)))
return (EAGAIN);
/*
* If file descriptor doesn't have all rights,
@ -3058,7 +3058,7 @@ fget_unlocked_seq(struct thread *td, int fd, cap_rights_t *needrightsp,
*/
atomic_thread_fence_acq();
fdt = fdp->fd_files;
if (seqc_consistent_nomb(fd_seqc(fdt, fd), seq))
if (seqc_consistent_no_fence(fd_seqc(fdt, fd), seq))
break;
fdrop(fp, td);
}
@ -3157,7 +3157,7 @@ fget_unlocked(struct thread *td, int fd, cap_rights_t *needrightsp,
atomic_thread_fence_acq();
fdt = fdp->fd_files;
#ifdef CAPABILITIES
if (__predict_false(!seqc_consistent_nomb(fd_seqc(fdt, fd), seq)))
if (__predict_false(!seqc_consistent_no_fence(fd_seqc(fdt, fd), seq)))
#else
if (__predict_false(fp != fdt->fdt_ofiles[fd].fde_file))
#endif

4
sys/sys/seqc.h
View File

@ -107,7 +107,7 @@ seqc_read(const seqc_t *seqcp)
return (ret);
}
#define seqc_consistent_nomb(seqcp, oldseqc) ({ \
#define seqc_consistent_no_fence(seqcp, oldseqc)({ \
const seqc_t *__seqcp = (seqcp); \
seqc_t __oldseqc = (oldseqc); \
\
@ -117,7 +117,7 @@ seqc_read(const seqc_t *seqcp)
#define seqc_consistent(seqcp, oldseqc) ({ \
atomic_thread_fence_acq(); \
seqc_consistent_nomb(seqcp, oldseqc); \
seqc_consistent_no_fence(seqcp, oldseqc); \
})
/*