From 71bd18d37359bbd7d5923898d40fd9993d5c15f7 Mon Sep 17 00:00:00 2001 From: Mateusz Guzik Date: Thu, 7 Jan 2021 07:34:14 +0100 Subject: [PATCH] fd: use seqc_read_notmodify when translating fds --- sys/kern/kern_descrip.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index e1ffdc3baf0..ad1916e87b6 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2921,9 +2921,7 @@ fgetvp_lookup_smr(int fd, struct nameidata *ndp, struct vnode **vpp, bool *fsear fdt = fdp->fd_files; if (__predict_false((u_int)fd >= fdt->fdt_nfiles)) return (EBADF); - seq = seqc_read_any(fd_seqc(fdt, fd)); - if (__predict_false(seqc_in_modify(seq))) - return (EAGAIN); + seq = seqc_read_notmodify(fd_seqc(fdt, fd)); fde = &fdt->fdt_ofiles[fd]; haverights = cap_rights_fde_inline(fde); fp = fde->fde_file; @@ -3032,7 +3030,7 @@ fget_unlocked_seq(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, */ for (;;) { #ifdef CAPABILITIES - seq = seqc_read(fd_seqc(fdt, fd)); + seq = seqc_read_notmodify(fd_seqc(fdt, fd)); fde = &fdt->fdt_ofiles[fd]; haverights = *cap_rights_fde_inline(fde); fp = fde->fde_file; @@ -3105,9 +3103,7 @@ fget_unlocked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, if (__predict_false((u_int)fd >= fdt->fdt_nfiles)) return (EBADF); #ifdef CAPABILITIES - seq = seqc_read_any(fd_seqc(fdt, fd)); - if (__predict_false(seqc_in_modify(seq))) - goto out_fallback; + seq = seqc_read_notmodify(fd_seqc(fdt, fd)); fde = &fdt->fdt_ofiles[fd]; haverights = cap_rights_fde_inline(fde); fp = fde->fde_file;