svn commit: r263958 - stable/10/sys/kern

[Mateusz Guzik]

Author: mjg
Date: Mon Mar 31 02:17:58 2014
New Revision: 263958
URL: http://svnweb.freebsd.org/changeset/base/263958

Log:
  MFC r263460:
  Take filedesc lock only for reading when allocating new fdtable.
  
  Code populating the table does this already.

Modified:
  stable/10/sys/kern/kern_descrip.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_descrip.c
==============================================================================
--- stable/10/sys/kern/kern_descrip.c	Mon Mar 31 01:54:59 2014	(r263957)
+++ stable/10/sys/kern/kern_descrip.c	Mon Mar 31 02:17:58 2014	(r263958)
@@ -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. */