[PATCH 3.16.y-ckt 33/58] net: don't OOPS on socket aio
Luis Henriques
luis.henriques at canonical.com
Thu Feb 19 13:52:03 UTC 2015
3.16.7-ckt7 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <hch at lst.de>
commit 06539d3071067ff146a9bffd1c801fa56d290909 upstream.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
net/socket.c | 3 ---
1 file changed, 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;
--
2.1.4
More information about the kernel-team
mailing list