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

fd: make fd/fp mandatory

Browse Source 
They are both always passed anyway.
This commit is contained in:
Mateusz Guzik 2020-12-23 13:50:34 +00:00
parent fee405e057
commit 20ac5cda96
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/kern_descrip.c
View File

@ -1976,6 +1976,9 @@ falloc_caps(struct thread *td, struct file **resultfp, int *resultfd, int flags,
struct file *fp;
int error, fd;
MPASS(resultfp != NULL);
MPASS(resultfd != NULL);
error = falloc_noinstall(td, &fp);
if (error)
return (error); /* no reference held on error */
@ -1986,13 +1989,8 @@ falloc_caps(struct thread *td, struct file **resultfp, int *resultfd, int flags,
return (error);
}
if (resultfp != NULL)
*resultfp = fp; /* copy out result */
else
fdrop(fp, td); /* release local reference */
if (resultfd != NULL)
*resultfd = fd;
*resultfp = fp;
*resultfd = fd;
return (0);
}