LU-506 kernel: FC15 - file_operations relate changes.

[fs/lustre-release.git] / libcfs / libcfs / linux / linux-tcpip.c

diff --git a/libcfs/libcfs/linux/linux-tcpip.c b/libcfs/libcfs/linux/linux-tcpip.c
index 9d673f0..95136c1 100644 (file)
--- a/libcfs/libcfs/linux/linux-tcpip.c
+++ b/libcfs/libcfs/linux/linux-tcpip.c
@@ -80,14 +80,12 @@ libcfs_sock_ioctl(int cmd, unsigned long arg)
 #ifdef HAVE_UNLOCKED_IOCTL
         if (sock_filp->f_op->unlocked_ioctl)
                 rc = sock_filp->f_op->unlocked_ioctl(sock_filp, cmd, arg);
-        else
+#else
+        lock_kernel();
+        rc = sock_filp->f_op->ioctl(sock_filp->f_dentry->d_inode,
+                                    sock_filp, cmd, arg);
+        unlock_kernel();
 #endif
-             {
-                lock_kernel();
-                rc =sock_filp->f_op->ioctl(sock_filp->f_dentry->d_inode,
-                                           sock_filp, cmd, arg);
-                unlock_kernel();
-             }
         set_fs(oldmm);
 
         fput(sock_filp);