diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-01-27 12:25:33 -0800 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-02-10 13:38:49 +0000 |
| commit | eb1f5dc857d1e14f3117326e765a63c35afc2b18 (patch) | |
| tree | f7425876be4d7ae029dcbce7f2934e4eb205207e /net/socket.c | |
| parent | ec9b54a4e453810803e824fd459c2572a76ba152 (diff) | |
net: don't OOPS on socket aio
commit 06539d3071067ff146a9bffd1c801fa56d290909 upstream.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'net/socket.c')
| -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 abf56b2a14f9..7050240a951b 100644 --- a/net/socket.c +++ b/net/socket.c @@ -887,9 +887,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; |