summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2015-01-27 12:25:33 -0800
committerDavid S. Miller <davem@davemloft.net>2015-01-27 12:25:33 -0800
commit06539d3071067ff146a9bffd1c801fa56d290909 (patch)
tree50f98313af70fdfe9d43ab5a18da4e425584952e /net
parent9afec6efc6b1043692eada758cd7837623dd943b (diff)
downloadlinux-06539d3071067ff146a9bffd1c801fa56d290909.tar.gz
linux-06539d3071067ff146a9bffd1c801fa56d290909.tar.bz2
linux-06539d3071067ff146a9bffd1c801fa56d290909.zip
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.c3
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,
static struct sock_iocb *alloc_sock_iocb(struct kiocb *iocb,
struct sock_iocb *siocb)
{
- if (!is_sync_kiocb(iocb))
- BUG();
-
siocb->kiocb = iocb;
iocb->private = siocb;
return siocb;