summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormjg <mjg@FreeBSD.org>2014-03-31 02:17:58 +0000
committermjg <mjg@FreeBSD.org>2014-03-31 02:17:58 +0000
commit11fbc59f9b71fd5d059d03fd72cf18b52ab38ac9 (patch)
tree7b824f2ff9b238597603b5d020efde8c6c615eb2
parent8a8ec2ebba8ebbcdaf1a241fb5c5353330cf3ff5 (diff)
downloadFreeBSD-src-11fbc59f9b71fd5d059d03fd72cf18b52ab38ac9.zip
FreeBSD-src-11fbc59f9b71fd5d059d03fd72cf18b52ab38ac9.tar.gz
MFC r263460:
Take filedesc lock only for reading when allocating new fdtable. Code populating the table does this already.
-rw-r--r--sys/kern/kern_descrip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 7fb39cc..97d899f 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1809,7 +1809,7 @@ fdinit(struct filedesc *fdp)
newfdp = malloc(sizeof *newfdp, M_FILEDESC, M_WAITOK | M_ZERO);
FILEDESC_LOCK_INIT(&newfdp->fd_fd);
if (fdp != NULL) {
- FILEDESC_XLOCK(fdp);
+ FILEDESC_SLOCK(fdp);
newfdp->fd_fd.fd_cdir = fdp->fd_cdir;
if (newfdp->fd_fd.fd_cdir)
VREF(newfdp->fd_fd.fd_cdir);
@@ -1819,7 +1819,7 @@ fdinit(struct filedesc *fdp)
newfdp->fd_fd.fd_jdir = fdp->fd_jdir;
if (newfdp->fd_fd.fd_jdir)
VREF(newfdp->fd_fd.fd_jdir);
- FILEDESC_XUNLOCK(fdp);
+ FILEDESC_SUNLOCK(fdp);
}
/* Create the file descriptor table. */
OpenPOWER on IntegriCloud