freebsd/freebsd-src
1
0 Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2026-11-09 17:13:08 -10:00
Code Issues Packages Projects Releases Wiki Activity

fd: assign fd_freefile early when copying

Browse Source 
This is to simplify an upcomming change.
This commit is contained in:
Mateusz Guzik committed 2022-02-13 13:07:08 +00:00
1 parent 893d20c95a
commit 809f3121be
1 file changed
+3 -4
Download Patch File Download Diff File Expand all files Collapse all files
sys/kern/kern_descrip.c
+3 -4
View File
@@ -2356,13 +2356,13 @@ fdcopy(struct filedesc *fdp)
FILEDESC_SLOCK(fdp);
}
/* copy all passable descriptors (i.e. not kqueue) */
newfdp->fd_freefile = -1;
newfdp->fd_freefile = fdp->fd_freefile;
for (i = 0; i <= lastfile; ++i) {
ofde = &fdp->fd_ofiles[i];
if (ofde->fde_file == NULL ||
(ofde->fde_file->f_ops->fo_flags & DFLAG_PASSABLE) == 0 ||
!fhold(ofde->fde_file)) {
if (newfdp->fd_freefile == -1)
if (newfdp->fd_freefile == fdp->fd_freefile)
newfdp->fd_freefile = i;
continue;
}
@@ -2371,8 +2371,7 @@ fdcopy(struct filedesc *fdp)
filecaps_copy(&ofde->fde_caps, &nfde->fde_caps, true);
fdused_init(newfdp, i);
}
if (newfdp->fd_freefile == -1)
newfdp->fd_freefile = i;
MPASS(newfdp->fd_freefile != -1);
FILEDESC_SUNLOCK(fdp);
return (newfdp);
}