From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-204799-1516217591-2-625612602978155883 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_05 -0.5, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='de', MailFrom='org' X-Spam-charsets: X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: linux-api-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516217590; b=keB7HYH98aJ6xoTubTCcO8JFdwu9YqEL5w7MIbRRoRZFtyH rm91EZQjpkRmergYsYyfLnVqqneikXp7QO4V3Mi1W2AZ/pZS+RduExk+eE6PLZwE XjiBEa9WIx9RsdocX95qM3ZHmBwN4zXmdSTgOizMmx+gPUCYXnXtMu3iJi3XPnhV sNnOySRCxmwlnbPvdfiFTtv6t4wGQtDTJylL6fu9lkNKfpoCUfuRKUep72WLw+zu fdx4is8rKqHMVJGd7MIxuGBf65FO3GjqQ8BUHf0EouIVSBMxIpW8VCHkahmSHuOr /sS2X/144YQXceUb7bbUCS1p3hhOSvLT3VtwfMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:sender:list-id; s=arctest; t=1516217590; bh=3Lqv4i9B4xy+At57HcylrIj8S7iVQxzlaV0NsPuPTEk=; b=Ceg8uJnVwwf1 FjYQFPBZ31oHUIk5ZBiS+GZmp4zUn7mW4RdJ4fzxaG7SoPZj33MAW1dOIRJlnSTy EMB2/6MMT7iQ5MzMCLl4br43LVyQ0Px+dB2MoWDEo5VwJ5pyYYh7VHX3sCSMzAf6 6dkIyW/DKVljx+j1VXXHM/jguxr5ppD3ulIpLhNp8kdF2x/DdzOU5fGmAaxJuv6v JKIE9yuTCcmRid2CmBBZipzPK+/pL+M7TiLnJxf/MzN5ysj8C7Oq62rBG8aMHg2U J0K84Zctuw/ub/U3dbDERKW0kRi8JQVBwvbUH6lQiZIIwi9i9BUszRSem1mS6S2W Epb7jpjWmw== ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered; 2048-bit rsa key sha256) header.d=infradead.org header.i=@infradead.org header.b=Op17mLgM x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=bombadil.20170209; dmarc=none (p=none,has-list-id=yes,d=none) header.from=lst.de; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-api-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=lst.de header.result=pass header_is_org_domain=yes Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered; 2048-bit rsa key sha256) header.d=infradead.org header.i=@infradead.org header.b=Op17mLgM x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=bombadil.20170209; dmarc=none (p=none,has-list-id=yes,d=none) header.from=lst.de; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-api-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=lst.de header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753966AbeAQTcv (ORCPT ); Wed, 17 Jan 2018 14:32:51 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:35105 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753388AbeAQT33 (ORCPT ); Wed, 17 Jan 2018 14:29:29 -0500 From: Christoph Hellwig To: viro@zeniv.linux.org.uk Cc: Avi Kivity , linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 29/36] net/phonet: convert to ->poll_mask Date: Wed, 17 Jan 2018 20:27:35 +0100 Message-Id: <20180117192742.710-30-hch@lst.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180117192742.710-1-hch@lst.de> References: <20180117192742.710-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-api-owner@vger.kernel.org X-Mailing-List: linux-api@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Signed-off-by: Christoph Hellwig --- net/phonet/socket.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/net/phonet/socket.c b/net/phonet/socket.c index 7563b0ac8386..c18c906c025f 100644 --- a/net/phonet/socket.c +++ b/net/phonet/socket.c @@ -341,15 +341,12 @@ static int pn_socket_getname(struct socket *sock, struct sockaddr *addr, return 0; } -static __poll_t pn_socket_poll(struct file *file, struct socket *sock, - poll_table *wait) +static __poll_t pn_socket_poll_mask(struct socket *sock, __poll_t events) { struct sock *sk = sock->sk; struct pep_sock *pn = pep_sk(sk); __poll_t mask = 0; - poll_wait(file, sk_sleep(sk), wait); - if (sk->sk_state == TCP_CLOSE) return POLLERR; if (!skb_queue_empty(&sk->sk_receive_queue)) @@ -474,7 +471,7 @@ const struct proto_ops phonet_stream_ops = { .socketpair = sock_no_socketpair, .accept = pn_socket_accept, .getname = pn_socket_getname, - .poll = pn_socket_poll, + .poll_mask = pn_socket_poll_mask, .ioctl = pn_socket_ioctl, .listen = pn_socket_listen, .shutdown = sock_no_shutdown, -- 2.14.2