summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_descrip.c
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2012-06-14 15:35:14 +0000
committerpjd <pjd@FreeBSD.org>2012-06-14 15:35:14 +0000
commit4a9c37500e595195522b7382715df72b5dd15669 (patch)
tree9f7cd4022bb1fb617e776a353bf2217478eb8ac7 /sys/kern/kern_descrip.c
parent7b02ff91719409c8e8110701c1aaba1982b273a1 (diff)
downloadFreeBSD-src-4a9c37500e595195522b7382715df72b5dd15669.zip
FreeBSD-src-4a9c37500e595195522b7382715df72b5dd15669.tar.gz
- Assert that the filedesc lock is being held when fdisused() is called.
- Fix white spaces. MFC after: 1 month
Diffstat (limited to 'sys/kern/kern_descrip.c')
-rw-r--r--sys/kern/kern_descrip.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index bf3d01d..e2fbedf 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -243,8 +243,10 @@ static int
fdisused(struct filedesc *fdp, int fd)
{
- KASSERT(fd >= 0 && fd < fdp->fd_nfiles,
- ("file descriptor %d out of range (0, %d)", fd, fdp->fd_nfiles));
+ FILEDESC_LOCK_ASSERT(fdp);
+
+ KASSERT(fd >= 0 && fd < fdp->fd_nfiles,
+ ("file descriptor %d out of range (0, %d)", fd, fdp->fd_nfiles));
return ((fdp->fd_map[NDSLOT(fd)] & NDBIT(fd)) != 0);
}
OpenPOWER on IntegriCloud