diff options
author | Christoph Hellwig <hch@lst.de> | 2015-01-27 15:25:33 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-27 15:25:33 -0500 |
commit | 06539d3071067ff146a9bffd1c801fa56d290909 (patch) | |
tree | 50f98313af70fdfe9d43ab5a18da4e425584952e /net | |
parent | 9afec6efc6b1043692eada758cd7837623dd943b (diff) |
net: don't OOPS on socket aio
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/socket.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/socket.c b/net/socket.c index a2c33a4dc7ba..418795caa897 100644 --- a/net/socket.c +++ b/net/socket.c | |||
@@ -869,9 +869,6 @@ static ssize_t sock_splice_read(struct file *file, loff_t *ppos, | |||
869 | static struct sock_iocb *alloc_sock_iocb(struct kiocb *iocb, | 869 | static struct sock_iocb *alloc_sock_iocb(struct kiocb *iocb, |
870 | struct sock_iocb *siocb) | 870 | struct sock_iocb *siocb) |
871 | { | 871 | { |
872 | if (!is_sync_kiocb(iocb)) | ||
873 | BUG(); | ||
874 | |||
875 | siocb->kiocb = iocb; | 872 | siocb->kiocb = iocb; |
876 | iocb->private = siocb; | 873 | iocb->private = siocb; |
877 | return siocb; | 874 | return siocb; |