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

[karo-tx-linux.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 5b0126234606dac94152b69fb42a571b1f3cc7bf..3e33959f3ce5711863fca7ce1805a4d1cf4ed6e0 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -140,8 +140,6 @@ static ssize_t sock_splice_read(struct file *file, loff_t *ppos,
 static const struct file_operations socket_file_ops = {
        .owner =        THIS_MODULE,
        .llseek =       no_llseek,
-       .read =         new_sync_read,
-       .write =        new_sync_write,
        .read_iter =    sock_read_iter,
        .write_iter =   sock_write_iter,
        .poll =         sock_poll,