- Remove the Giant acquisition from linux_socket_ioctl() as it was really

  there to protect fdrop() (which in turn can call vrele()), however,
  fdrop_locked() grabs Giant for us, so we do not have to.

Reviewed by:	jhb
Inspired by:	alc

1 files changed, 2 insertions, 11 deletions

diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index 3b97b44..77e2942 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -2027,15 +2027,10 @@ linux_ioctl_socket(struct thread *td, struct linux_ioctl_args *args)
 	ifp = NULL;
 	error = 0;
 	
-	mtx_lock(&Giant);
-	if ((error = fget(td, args->fd, &fp)) != 0) {
-		mtx_unlock(&Giant);
+	if ((error = fget(td, args->fd, &fp)) != 0)
 		return (error);
-	}
 	type = fp->f_type;
 	fdrop(fp, td);
-	mtx_unlock(&Giant);
-
 	if (type != DTYPE_SOCKET) {
 		/* not a socket - probably a tap / vmnet device */
 		switch (args->cmd) {
@@ -2243,14 +2238,10 @@ linux_ioctl_private(struct thread *td, struct linux_ioctl_args *args)
 	struct file *fp;
 	int error, type;
 
-	mtx_lock(&Giant);
-	if ((error = fget(td, args->fd, &fp)) != 0) {
-		mtx_unlock(&Giant);
+	if ((error = fget(td, args->fd, &fp)) != 0)
 		return (error);
-	}
 	type = fp->f_type;
 	fdrop(fp, td);
-	mtx_unlock(&Giant);
 	if (type == DTYPE_SOCKET)
 		return (linux_ioctl_socket(td, args));
 	return (ENOIOCTL);