From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3815124-1522424653-2-16453354352697315414 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.249, 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='CN', 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=fm2; t= 1522424652; b=Dq2u4JnvmGqCHSff3f8QKfrstvZ6H54XCQghLj7A0e6nWcPrp9 OpyHktcVOh1vYRdeo8NHB2weGaUkh/WBlyHSsl9FFycduC7BCJPi7FGGS+1TDclw SGVjoiwT4h3xDVaEPjb82zHCAPfLP+1c7Kb40v8sc31+5KMsijumsNWzwl5sOgK/ j2TovqxX0ynFPLkGvejlLS9jj/dZYR1rYijR/zuqZpZybIpWbl77+390o+dFEj0P 7uxJQK3lSuySbcYAc1OT3kmue29IhPDHO6Bx1MxZuPkgLrWIGkOepBPS1auRTDiF SyrquP7fPUxXqP15ATsIXzxDaenzMtA0XTFA== 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=fm2; t=1522424652; bh= 8s3l2WEdAfY3Zli7acWKC0c1lZwgW0FRQMiQDnOq7Qw=; b=HiksfQoxJyltdmaY Vg3DMJS62x2HYvYPyMOE25WiwOuz9JnoZOVaHarhdaTcMMYiyc0/47YG3kHCrt5H vJ75VdBI3IeOKrw1UIRggkDm03OjPfD/iE+V0FZpl3QUHZ+d0Dt1wc6eFqVqd5W9 aAzvdsZW3+XdFda1OS4lr1U7LnTUg4CSqtKbgoUyfB1XIqjeJykDJDm4KfT8XVaq Rf8E2klHf5uwas+4t00SNNTaR+HV3TI+gBA8+OvNsvYXutiFzCwZ/yM5SLKitVc/ JxeApb/jgIvouoSu3UojbWisq/OUfkAY4fqkmED2FSphM4yh21hShpiOx383wD+z fuZYOw== ARC-Authentication-Results: i=1; mx4.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=TA4EQCC2 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-cm=none score=0; 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; x-vs=clean score=0 state=0 Authentication-Results: mx4.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=TA4EQCC2 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-cm=none score=0; 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; x-vs=clean score=0 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfEO+i39TvwIDy8MFTqLK6DCNNIch4N5VKvBvrLcRdGVwDrBr4NqhfhgwAMQQZ6dG7Tdva7M5VUrGKdPbtkEJSWKjFue4a8YpJ2i4ytEhyT8E3fwqQCU/ GtxgTRS9ffS4GZISD9tSUo6McIrfjZctqDnyhWzWC66zf9GKyxQsdSbzJKvRFjBX2cu0+eOBZxqvvvI/UdtbOEo6iFLAsLZVyka0YKJSrgRMd+jA+ZQo+jkI X-CM-Analysis: v=2.3 cv=JLoVTfCb c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=v2DPQv5-lfwA:10 a=VwQbUJbxAAAA:8 a=F55Z69aUwsZ0p8WbI6QA:9 a=x8gzFH9gYPwA:10 a=AjGcO6oz07-iQ99wixmX:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752086AbeC3PoA (ORCPT ); Fri, 30 Mar 2018 11:44:00 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:42738 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751907AbeC3Pck (ORCPT ); Fri, 30 Mar 2018 11:32:40 -0400 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 27/32] net/rxrpc: convert to ->poll_mask Date: Fri, 30 Mar 2018 17:08:04 +0200 Message-Id: <20180330150809.28094-28-hch@lst.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180330150809.28094-1-hch@lst.de> References: <20180330150809.28094-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/rxrpc/af_rxrpc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c index 0c9c18aa7c77..d2440d5c3ce8 100644 --- a/net/rxrpc/af_rxrpc.c +++ b/net/rxrpc/af_rxrpc.c @@ -729,15 +729,11 @@ static int rxrpc_getsockopt(struct socket *sock, int level, int optname, /* * permit an RxRPC socket to be polled */ -static __poll_t rxrpc_poll(struct file *file, struct socket *sock, - poll_table *wait) +static __poll_t rxrpc_poll_mask(struct socket *sock, __poll_t events) { struct sock *sk = sock->sk; struct rxrpc_sock *rx = rxrpc_sk(sk); - __poll_t mask; - - sock_poll_wait(file, sk_sleep(sk), wait); - mask = 0; + __poll_t mask = 0; /* the socket is readable if there are any messages waiting on the Rx * queue */ @@ -940,7 +936,7 @@ static const struct proto_ops rxrpc_rpc_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = sock_no_getname, - .poll = rxrpc_poll, + .poll_mask = rxrpc_poll_mask, .ioctl = sock_no_ioctl, .listen = rxrpc_listen, .shutdown = rxrpc_shutdown, -- 2.14.2