diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-01-27 12:25:33 -0800 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-02-10 11:16:51 +0100 |
| commit | d7a5ebfe21c15d1a871587be0006f3fc31e54296 (patch) | |
| tree | 7cecd6cc7822f092ee95a6a1b4caa45ef9c08a28 /net | |
| parent | 7b254cb1d121f8a1def63aad8d9104114b0b0e53 (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: Jiri Slaby <jslaby@suse.cz>
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 c8ca896a9a5a..3afb43efd3e5 100644 --- a/net/socket.c +++ b/net/socket.c @@ -885,9 +885,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; |