Skip to contentSkip to conversation

X.25 remove bkl in poll

PATCH Applied Andrew Hendry 2 participants 2 messages Sep 22, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 2/2 X.25 remove bkl in poll

The x25_datagram_poll didn't add anything, removed it.

---
 net/x25/af_x25.c |   14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)
net/x25/af_x25.c +1 -13
index 4ebde0d..b371a47 100644
@@ -923,18 +923,6 @@ out:
 	return rc;
 }
 
-static unsigned int x25_datagram_poll(struct file *file, struct socket *sock,
-			   poll_table *wait)
-{
-	int rc;
-
-	lock_kernel();
-	rc = datagram_poll(file, sock, wait);
-	unlock_kernel();
-
-	return rc;
-}
-
 int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb,
 			unsigned int lci)
 {
@@ -1742,7 +1730,7 @@ static const struct proto_ops x25_proto_ops = {
 	.socketpair =	sock_no_socketpair,
 	.accept =	x25_accept,
 	.getname =	x25_getname,
-	.poll =		x25_datagram_poll,
+	.poll =		datagram_poll,
 	.ioctl =	x25_ioctl,
 #ifdef CONFIG_COMPAT
 	.compat_ioctl = compat_x25_ioctl,
Signature · 1 line
1.7.0.4