Received: by 10.223.148.5 with SMTP id 5csp6275541wrq; Wed, 17 Jan 2018 11:36:02 -0800 (PST) X-Google-Smtp-Source: ACJfBouiwnkyEytn7rQcIQqkFdW0s9hJVwhL16m4xkZparOwYi9kpveuZEU7GgTlP9QUnOD0JpO+ X-Received: by 10.84.200.200 with SMTP id u8mr17160929plh.272.1516217762830; Wed, 17 Jan 2018 11:36:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516217762; cv=none; d=google.com; s=arc-20160816; b=RFacD/x5MyYy2Mvz3KOwKidCynCpSIafa/g4SdK9McXMoZ7V8yI9SMxYhU4kHQSWcT CfEqEu4SGCGMMQeQxUbeza4pkeb7Mgwkyg+Uxz5NdfQWn7wcAAW4IdQCdYXVLbtnBYpk VPQapbW5DYlvHCCC8k3NOjyJExmj5Z42QkdVK8g/IMa/o2WBxx78nsYAB3H39Bit67hd fraeNinqJL8p0TD+9UUSuYpEL7NZHis9OUw+6wxktFcoCOf1mQPMhjLPWHABm6H4JuWA blAQKrRO0ur+2xasEQO5LpLZfP9fQnKBMb6XAMVqdjVeBsHlbPZRPTdphBRZmRgj+xFt 7lqg== 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=i1c3lHeoahhghGZ7iTsLWYhLhLm3nylzAOOYwAVSxzM=; b=UBCiYpIX0G+aiw19lAe34fuPYWYVdgDOOFS9WYl2Mqet1dx/cS2Y1eL/cNuWu9f3Ok 6TLcSTIwtRcsXAuseCJLyZ+roWkOg/7/GKtmOyL6Mqr88v+eB0bvISgI+rZSoogFLxKF qvMvzaceyxoqkcrj7u5DqWo01wDJ/C+v6NYkE7E1i9Szska2VZjv0xmH+3A8pyJZn1dU 9NVAhF4HZ6t+sWKLQLr2NmJcg+e1HFaSiK97C21fZtUOjL/zVQQ4b70ueqJh9kmlSS5k mxZZYc8yCTnYXtjRsO7fw+DDcC2aHWRzVS4835JOEOLSiBszkf8jft259eOZtknvZyni 658Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=FsHTFC1J; 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 g17si4839548plo.357.2018.01.17.11.35.48; Wed, 17 Jan 2018 11:36:02 -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=FsHTFC1J; 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 S1753963AbeAQT3L (ORCPT + 99 others); Wed, 17 Jan 2018 14:29:11 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:58417 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753111AbeAQT3I (ORCPT ); Wed, 17 Jan 2018 14:29:08 -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=i1c3lHeoahhghGZ7iTsLWYhLhLm3nylzAOOYwAVSxzM=; b=FsHTFC1JBH7NYo5AFaO2GBJTA zVBkgcZV+7VmWaA7CvzfaYjX0oAahaR60+c+XFQuJCW0fhvnyUpZLMhNe24BSun9obPR+kzH8LpTw Tv3BGMc3r0YvJTtCQxi/BzoZ3giqP18oQgmbsvtazWacMKY3/lvChLnpwhWWRN45OAF97FghtLhuq Qo92qCk2n1ysdn1lot0RBkwXDb7V61we5htaKpchLiKqvR987z8iceQYI6nSuonj01MqVxqPNVBpZ 4+CsSwhnwD4CHULe6quoufBx6ZKvWU5XMZIhNveb2RE+F5wns8NUNKtl3dCaYrydwHm5udG4KT/Z2 852jFXfgg==; 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 1ebtOU-0003Kl-Hy; Wed, 17 Jan 2018 19:29:07 +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 23/36] net/vmw_vsock: convert to ->poll_mask Date: Wed, 17 Jan 2018 20:27:29 +0100 Message-Id: <20180117192742.710-24-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/vmw_vsock/af_vsock.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index bbd97d3bd8fb..664c6346c0d6 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -850,18 +850,11 @@ static int vsock_shutdown(struct socket *sock, int mode) return err; } -static __poll_t vsock_poll(struct file *file, struct socket *sock, - poll_table *wait) +static __poll_t vsock_poll_mask(struct socket *sock, __poll_t events) { - struct sock *sk; - __poll_t mask; - struct vsock_sock *vsk; - - sk = sock->sk; - vsk = vsock_sk(sk); - - poll_wait(file, sk_sleep(sk), wait); - mask = 0; + struct sock *sk = sock->sk; + struct vsock_sock *vsk = vsock_sk(sk); + __poll_t mask = 0; if (sk->sk_err) /* Signify that there has been an error on this socket. */ @@ -1091,7 +1084,7 @@ static const struct proto_ops vsock_dgram_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = vsock_getname, - .poll = vsock_poll, + .poll_mask = vsock_poll_mask, .ioctl = sock_no_ioctl, .listen = sock_no_listen, .shutdown = vsock_shutdown, @@ -1849,7 +1842,7 @@ static const struct proto_ops vsock_stream_ops = { .socketpair = sock_no_socketpair, .accept = vsock_accept, .getname = vsock_getname, - .poll = vsock_poll, + .poll_mask = vsock_poll_mask, .ioctl = sock_no_ioctl, .listen = vsock_listen, .shutdown = vsock_shutdown, -- 2.14.2