diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-01-27 12:25:33 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-26 17:50:11 -0800 |
| commit | 498715877b462fc37631699b4a9d32886d7e17f4 (patch) | |
| tree | 8e84031c4e0a193c7cd13acbfcf9d103797ff41b /net | |
| parent | db99ad8820f75faa28eac34d8bb5cd72e91554f5 (diff) | |
| download | lwn-498715877b462fc37631699b4a9d32886d7e17f4.tar.gz lwn-498715877b462fc37631699b4a9d32886d7e17f4.zip | |
net: don't OOPS on socket aio
[ Upstream commit 06539d3071067ff146a9bffd1c801fa56d290909 ]
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 a19ae1968d37..1b2c2d62ff20 100644 --- a/net/socket.c +++ b/net/socket.c @@ -886,9 +886,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; |