From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3845081-1526037300-2-16843076021736565848 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.25, MAILING_LIST_MULTI -1, RCVD_IN_DNSWL_HI -5, 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=fm2; t= 1526037299; b=kdmJtD44MVK0gQQxU0D2o9kVl9PTuzz0KagccFt1/z3sWYeBS0 94nrbJvETanVAcLlvBv0/xUkVihtPqgvyYnHQ4+dX84eUkKv+GNvqkjSA3rvzgrV Yux5/y0laKpqnQXMD13nwxwxY/TC0vMjJa/FpU6KDpm/vMHvInQlAxGqcVvEhSf/ YfykTbshSc8zI3lylMl2024e6RZfA+OAkoGDFJwLIKty5OVCOjl2EiQuWfZNilhz NTuFwNA55409VpkxVpX0bEn6bXno0croaifXCO48NTPsDF1RffLguB7pZ/cvBw0x NPpaLpu9wT8PAUVz7tqAydMnx7cLCDlvZ+0Q== 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=1526037299; bh= OG/3FkKUPa/C2IpkpEYuVJ6JevawRbIXYMusu9CDMWY=; b=CclaHWmDu9bBHHhT RAY+ouO28J6wU0ydALxfKwJ/xJYo8renyj7TOmSjj0rvXMPzuyzYLAmbNB4XDU4w i4eRPDGK6S01qKLcvP8ZM/n4MD8qsT4CRAM9HbY4fV6ne0kk7+lkbj0RqGTiHY8B ApbFEvvU5lKu2ErpHr70GxxBYxsBqE22/HiZH7+7nwaGLlup5O1ooqcWAzwc4r8q NRwtQ2FmkiFyNLUpW+MFRkZWmSJSsocpzTRjcS4epJYTz008pII3TaY82oq/Xe/Y UB52r2toe1w7sbVsOrJ0JHd9yChWlZTgmWVSgPpEmhg5jH3OZRScotLI0A8mNmuq 7h+RVQ== ARC-Authentication-Results: i=1; mx2.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=Ux/vamup 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: mx2.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=Ux/vamup 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: MS4wfLFRvvHuUi+0cqZ7tKQnpbb3/s8T7wayRhDNdSW64c0EhlPv6T9quzeVVw6PIUqYn7pfcl8HuxkKJfRDuCxTeZ5r4YWQa7asevThNUFOeMEKZVRYx2Nf fAzIoMs1UgdmGVpJHGnIMAS441gaQPQVP5fI/P0nN++39iWd8jAvHZy6MdmmCsWrqa6jsWCSnEjtY11x+UgWdm3CDlRXXRDlGm/Ct7uhcehMwlver2BME5FA X-CM-Analysis: v=2.3 cv=E8HjW5Vl c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=VUJBJC2UJ8kA:10 a=VwQbUJbxAAAA:8 a=2Q-G4Ex131KUB3becfsA: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 S1753421AbeEKLOf (ORCPT ); Fri, 11 May 2018 07:14:35 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:47508 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753345AbeEKLJZ (ORCPT ); Fri, 11 May 2018 07:09:25 -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 25/32] net/phonet: convert to ->poll_mask Date: Fri, 11 May 2018 13:07:56 +0200 Message-Id: <20180511110803.10910-26-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511110803.10910-1-hch@lst.de> References: <20180511110803.10910-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 9ecf02def928..ea2bfc3aafb9 100644 --- a/net/phonet/socket.c +++ b/net/phonet/socket.c @@ -340,15 +340,12 @@ static int pn_socket_getname(struct socket *sock, struct sockaddr *addr, return sizeof(struct sockaddr_pn); } -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 EPOLLERR; if (!skb_queue_empty(&sk->sk_receive_queue)) @@ -473,7 +470,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.17.0