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

fd: add finstall_refed

Browse Source 
Can be used to consume an already existing reference and consequently
avoid atomic ops.
This commit is contained in:
Mateusz Guzik 2021-01-12 17:05:27 +01:00
parent 4faa375cdd
commit 530b699a62
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/kern/kern_descrip.c
View File

@ -2059,7 +2059,7 @@ _finstall(struct filedesc *fdp, struct file *fp, int fd, int flags,
}
int
finstall(struct thread *td, struct file *fp, int *fd, int flags,
finstall_refed(struct thread *td, struct file *fp, int *fd, int flags,
struct filecaps *fcaps)
{
struct filedesc *fdp = td->td_proc->p_fd;
@ -2067,18 +2067,30 @@ finstall(struct thread *td, struct file *fp, int *fd, int flags,
MPASS(fd != NULL);
if (!fhold(fp))
return (EBADF);
FILEDESC_XLOCK(fdp);
error = fdalloc(td, 0, fd);
if (__predict_false(error != 0)) {
FILEDESC_XUNLOCK(fdp);
fdrop(fp, td);
return (error);
if (__predict_true(error == 0)) {
_finstall(fdp, fp, *fd, flags, fcaps);
}
_finstall(fdp, fp, *fd, flags, fcaps);
FILEDESC_XUNLOCK(fdp);
return (0);
return (error);
}
int
finstall(struct thread *td, struct file *fp, int *fd, int flags,
struct filecaps *fcaps)
{
int error;
MPASS(fd != NULL);
if (!fhold(fp))
return (EBADF);
error = finstall_refed(td, fp, fd, flags, fcaps);
if (__predict_false(error != 0)) {
fdrop(fp, td);
}
return (error);
}
/*

2
sys/sys/filedesc.h
View File

@ -234,6 +234,8 @@ void _finstall(struct filedesc *fdp, struct file *fp, int fd, int flags,
struct filecaps *fcaps);
int finstall(struct thread *td, struct file *fp, int *resultfd, int flags,
struct filecaps *fcaps);
int finstall_refed(struct thread *td, struct file *fp, int *resultfd, int flags,
struct filecaps *fcaps);
int fdalloc(struct thread *td, int minfd, int *result);
int fdallocn(struct thread *td, int minfd, int *fds, int n);
int fdcheckstd(struct thread *td);