Received: by 10.223.148.5 with SMTP id 5csp6274366wrq; Wed, 17 Jan 2018 11:34:54 -0800 (PST) X-Google-Smtp-Source: ACJfBosFg3zyaOqoTvoWpBb+lKkZEU0aVqydWSbInKTm5I5qfskvHxY2VqZmaw1XyWu/mdMYZYfC X-Received: by 10.98.147.7 with SMTP id b7mr38870917pfe.236.1516217694209; Wed, 17 Jan 2018 11:34:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516217694; cv=none; d=google.com; s=arc-20160816; b=mgZp3Ase8KJP8v5B2prT0KFraF+KhiEiRdyd4/KiHp5x4YCwxTkwQijh4qEVOnfhz6 UGPkBo+6f6ja3Crs2cM/pTxnnvOaB/EatUOa99hN+MphQxIxtpVZ32Spal4jlQutZCPc 3QAPDyP1XwXktqAzh0un7bCkC3qSezB4K/N7CVQq4/FDXTdIduvmWEW8Ybt2N578So+w uis73vcSeo3n8HMZqY6gPDGFShzPR0Zv2WdCuvXKOUwMQTWv9O8fpgOoaQzVjqzffuHl NBLGcbXLMwh+fXoQDvqcAZ086c8u3/RE36yQLGP+jHGhdwbA65gAGlZvXJSd1VSe/yL+ Gr8Q== 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=N2wHNUnOjWUynBBkfFxylE8eCrOsbjb2ZVD4+7zrPVYul3mtZ91R0PYmXjPFKCJG1R imknH2SRFQUo7eeQkqCZgFcbuE90ZaOhPxNKgIPny9m7OHbP2V4bq0gICD3CqOLNpnIs 7qfimrjSsMgD7vECnv0K6bN7K0RphY5MdK4GNPB5HOxwgTRZJy3lor3Ty+flJJ4B7XWB 1iVoU6OYz1o8ODuSfMjyTqhm0pn8ZZET5w6pFfEJmlGi8BeXXE8PK1uqXhKyyzMCyZMo M8TmHLsUIIqBl9kanFn4W0C0TgdVVWmJFa5mYC3dXqiiVVI3Y7buTStKHzTGhrsGgbth plBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=oPcDZ1XD; 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 u59si3166814plb.703.2018.01.17.11.34.40; Wed, 17 Jan 2018 11:34:54 -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=oPcDZ1XD; 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 S1753778AbeAQT30 (ORCPT + 99 others); Wed, 17 Jan 2018 14:29:26 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:38245 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754123AbeAQT3X (ORCPT ); Wed, 17 Jan 2018 14:29:23 -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=oPcDZ1XDTTMysBz2O4yCzWJq3 oJQqbRmgMvyr91xk0oBib9or9IB92PWdClRWjNV0QlMAKKxihrGrHjdY6f4ba/mqyfom3GyMRwoer U4krK2fAtvZRqQNFoq1xEv5EQXTdIs+7toHZlGsd90Kgek3f3chvySBh0Fz562Nil8w0ziopY02CB zNlrbLhfg6a/daipwAocJjD/e267F534BAsfz1ToTU9JI+XTUNipgybn6p/kpIlthsmSFySg23IcT ll1bM5Dw7mDAZsCr2sqQNOtCUeqUgaRelumRCk+mYVPNB/oTcrD18Z+RDpo7esmX6T38IYON6SPvi Vy0kB4JLw==; Received: from 77.117.185.35.wireless.dyn.drei.com ([77.117.185.35] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.89 #1 (Red Hat Linux)) id 1ebtOi-0003N5-Ut; Wed, 17 Jan 2018 19:29:21 +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: Wed, 17 Jan 2018 20:27:33 +0100 Message-Id: <20180117192742.710-28-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-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