Linux Headquarters
[ Register ]
[ About us ] [ Home Page ]

Advertisement
[ Kernel ] [ Documentation ] [ Links ] [ Books ]

Advertisement

Kernel v2.6.25-rc6-git8 /net/socket.c

Filename:/net/socket.c
Lines Added:3
Lines Deleted:4
Also changed in: (Previous) 2.6.25-rc6  2.6.25-rc5  2.6.25-rc4  2.6.25-rc3  2.6.25-rc2  2.6.25-rc1 
(Following) 2.6.25-rc7  2.6.25-rc8  2.6.25-rc9  2.6.25  2.6.25-git2  2.6.25-git3 

Location
[  2.6.25-rc6-git8
  [  net
     o  socket.c

Patch

diff --git a/net/socket.c b/net/socket.c
index b6d35cd..9d3fbfb 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -909,11 +909,10 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
          if (!dlci_ioctl_hook)
             request_module("dlci");
 
-         if (dlci_ioctl_hook) {
-            mutex_lock(&dlci_ioctl_mutex);
+         mutex_lock(&dlci_ioctl_mutex);
+         if (dlci_ioctl_hook)
             err = dlci_ioctl_hook(cmd, argp);
-            mutex_unlock(&dlci_ioctl_mutex);
-         }
+         mutex_unlock(&dlci_ioctl_mutex);
          break;
       default:
          err = sock->ops->ioctl(sock, cmd, arg);


Comments: webmaster (at) linuxhq.com.
Advertising: banners (at) linuxhq.com.
Compilation ©1998-2008 Linux Headquarters, Inc.