projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9afec6e
)
net: don't OOPS on socket aio
author
Christoph Hellwig
<hch@lst.de>
Tue, 27 Jan 2015 20:25:33 +0000
(12:25 -0800)
committer
David S. Miller
<davem@davemloft.net>
Tue, 27 Jan 2015 20:25:33 +0000
(12:25 -0800)
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/socket.c
patch
|
blob
|
history
diff --git
a/net/socket.c
b/net/socket.c
index a2c33a4dc7bab45e520556557924b62d24951d85..418795caa8979fd0eb5d19e4d1fe3376fc0e9b20 100644
(file)
--- 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;