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

Use fget() in kqueue_register() instead of doing all the work by hand.

Browse Source
This commit is contained in:
John Baldwin 2006-06-12 21:46:23 +00:00
parent acb8c14985
commit 5c69ad8374
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=159553
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/kern/kern_event.c
View File

@ -754,15 +754,12 @@ kqueue_fo_release(int filt)
int
kqueue_register(struct kqueue *kq, struct kevent *kev, struct thread *td, int waitok)
{
struct filedesc *fdp;
struct filterops *fops;
struct file *fp;
struct knote *kn, *tkn;
int error, filt, event;
int haskqglobal;
int fd;
fdp = NULL;
fp = NULL;
kn = NULL;
error = 0;
@ -778,22 +775,13 @@ kqueue_register(struct kqueue *kq, struct kevent *kev, struct thread *td, int wa
findkn:
if (fops->f_isfd) {
KASSERT(td != NULL, ("td is NULL"));
fdp = td->td_proc->p_fd;
FILEDESC_LOCK(fdp);
/* validate descriptor */
fd = kev->ident;
if (fd < 0 || fd >= fdp->fd_nfiles ||
(fp = fdp->fd_ofiles[fd]) == NULL) {
FILEDESC_UNLOCK(fdp);
error = EBADF;
error = fget(td, kev->ident, &fp);
if (error)
goto done;
}
fhold(fp);
if ((kev->flags & EV_ADD) == EV_ADD && kqueue_expand(kq, fops,
kev->ident, 0) != 0) {
/* unlock and try again */
FILEDESC_UNLOCK(fdp);
/* try again */
fdrop(fp, td);
fp = NULL;
error = kqueue_expand(kq, fops, kev->ident, waitok);
@ -811,7 +799,6 @@ kqueue_register(struct kqueue *kq, struct kevent *kev, struct thread *td, int wa
* they are the same thing.
*/
if (fp->f_data == kq) {
FILEDESC_UNLOCK(fdp);
error = EINVAL;
goto done;
}
@ -819,7 +806,6 @@ kqueue_register(struct kqueue *kq, struct kevent *kev, struct thread *td, int wa
KQ_GLOBAL_LOCK(&kq_global, haskqglobal);
}
FILEDESC_UNLOCK(fdp);
KQ_LOCK(kq);
if (kev->ident < kq->kq_knlistsize) {
SLIST_FOREACH(kn, &kq->kq_knlist[kev->ident], kn_link)