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:49:01 -0800 |
| commit | db4d24bc7f3be9fedd6f97585a2ef9f72b7478e7 (patch) | |
| tree | 1fa40dffd6e6f70a7b55545932de085c4e41c8c3 /net/socket.c | |
| parent | e3b175f60e9c79f559d14f76590a701b62c583c4 (diff) | |
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/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 fe20c319a0bb..cf9ebf10c841 100644 --- a/net/socket.c +++ b/net/socket.c @@ -892,9 +892,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; |