Received: by 10.223.176.46 with SMTP id f43csp3335526wra; Mon, 22 Jan 2018 12:19:44 -0800 (PST) X-Google-Smtp-Source: AH8x225V28ZG4ex01q9UQsBJu+iJ8zz8Ecmal9GljiJOSrVSjwxTDFJSXLZ/wLPDfKXKvWpHcAYG X-Received: by 10.107.171.199 with SMTP id u190mr111354ioe.95.1516652384618; Mon, 22 Jan 2018 12:19:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516652384; cv=none; d=google.com; s=arc-20160816; b=e0J4kjNnCCRjTgMx6tbSTRGctwSa8MX/mHZ5i4wUgvoL8VmeBUwE0i/40KBHTykS5W w7SW5J+kdoajgehQG+QLHmIkyXTj3avUMM+HKaRDGCNS6wiKBWKq9qOA7ZU4uuw0E45e jmNbnl0WjLyiFk3cEu3tYJPwJXwKOREpUhxk4zMDBL1iOKq4RIsZ+E1ce3eQAQv2fFjc jbXo+Ba0NL3BHSWcyShP7wnkaogDfyFjTnzHU/klzthVlhYEdVLEHO0c/0yIJeuP6/PL h1CF58JNDFHzMMCk/kMB/iu1DLHFgcRNHWnPAPK4vtJEuml5yquxpDNr9r51EPzI5ifH 1Fog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=bR/tm0PSm5jHBJvp/y7vW50uzH/wwEv2MbCLyly71ww=; b=SlIJi5TiZBZsu953YDcb/laJGSuFqJQ5YiIkc2LqS7jlsekWhnUcJBbb6Oxy4nDLRC Au+Xps7Ax8IaK+ihupB87C1VzUdyYx8xMwzF3/6fsbZG1PLpd4RPGSpb26eLko3e7uSr 5JlSB8o1+x5q8rHLoKFhEa6D3tQk/MtytldVmQddXd70763ozOZGobJK3qpV31+pwsEB F9AE2H6wSUr54xmpP3YuLJGv9YthrtRerqmfpMPvGeBVEn6nC+u0uDhTjctF47Vq8Ghi lkGIUHacaN3UdfaOJui6YH88wIvuQhWcZUVbk6XIutDVelLq1Oajjv64hvkuI1xo4PK7 gGhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=CG/k/ikS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r22si13145996iod.154.2018.01.22.12.19.31; Mon, 22 Jan 2018 12:19:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=CG/k/ikS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751822AbeAVUTJ (ORCPT + 99 others); Mon, 22 Jan 2018 15:19:09 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:49485 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751803AbeAVUOQ (ORCPT ); Mon, 22 Jan 2018 15:14:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=bR/tm0PSm5jHBJvp/y7vW50uzH/wwEv2MbCLyly71ww=; b=CG/k/ikSAFu21yr9alcMnSnKl duUynlHPFOpVA/cY8c77jugfrNboTqrfXymSirTs2EUQozvdIZJ/k3c28S1GMYhWEb1mV38dYwIiT ukpgYTq0ZdH/F9Y2AW/RJqHLyqDgmUUhPgOj6FAS/aq6lZhU0IJvEroR7tgcIJwT8gQNVODyIHiDL 7dpfG8XlbqGNffRlC+kevLHral4UMipRwy8R2itumjIoDaOZKQd5VUNG012yo7DpBxs71qFny3dvN hRXgMMYJcaO2LvxKeIRSpISOQTq9jgC/IhDnED7k7iWuK1G23qo+8bgNJwIL4HR0PXx7w0MBrMw/P nxquBccrA==; Received: from 178.114.226.247.wireless.dyn.drei.com ([178.114.226.247] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.89 #1 (Red Hat Linux)) id 1ediTu-0007kk-55; Mon, 22 Jan 2018 20:14:14 +0000 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/36] net/caif: convert to ->poll_mask Date: Mon, 22 Jan 2018 21:12:34 +0100 Message-Id: <20180122201243.31610-28-hch@lst.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180122201243.31610-1-hch@lst.de> References: <20180122201243.31610-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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Christoph Hellwig --- net/caif/caif_socket.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index 64048cec41e0..3e47cafbe3e7 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -934,15 +934,11 @@ static int caif_release(struct socket *sock) } /* Copied from af_unix.c:unix_poll(), added CAIF tx_flow handling */ -static __poll_t caif_poll(struct file *file, - struct socket *sock, poll_table *wait) +static __poll_t caif_poll_mask(struct socket *sock, __poll_t events) { struct sock *sk = sock->sk; - __poll_t mask; struct caifsock *cf_sk = container_of(sk, struct caifsock, sk); - - sock_poll_wait(file, sk_sleep(sk), wait); - mask = 0; + __poll_t mask = 0; /* exceptional events? */ if (sk->sk_err) @@ -976,7 +972,7 @@ static const struct proto_ops caif_seqpacket_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = sock_no_getname, - .poll = caif_poll, + .poll_mask = caif_poll_mask, .ioctl = sock_no_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown, @@ -997,7 +993,7 @@ static const struct proto_ops caif_stream_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = sock_no_getname, - .poll = caif_poll, + .poll_mask = caif_poll_mask, .ioctl = sock_no_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown, -- 2.14.2