Merge tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linux

[linux-2.6-block.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index ffd9cb46902b3640c5a52947391ad16c5d0c69b9..fe20c319a0bb37dd475b7a8a32dccd57ac4e15d9 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -1065,7 +1065,8 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
                        err = -EFAULT;
                        if (get_user(pid, (int __user *)argp))
                                break;
-                       err = f_setown(sock->file, pid, 1);
+                       f_setown(sock->file, pid, 1);
+                       err = 0;
                        break;
                case FIOGETOWN:
                case SIOCGPGRP: