Received: by 10.223.176.46 with SMTP id f43csp3336021wra; Mon, 22 Jan 2018 12:20:17 -0800 (PST) X-Google-Smtp-Source: AH8x2240fLL34p1xfjsSJ2zoqYGr/q4D5tWDFzBykIuvpZ+pXOIprFzfwMMG52fRJZisyu5VEjHW X-Received: by 10.36.48.12 with SMTP id q12mr4903itq.105.1516652417192; Mon, 22 Jan 2018 12:20:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516652417; cv=none; d=google.com; s=arc-20160816; b=P7hLrDGpDNPqY9hZjMuDELWbBrzAUWspBAIppYmAnp2WHDEUQ1xkwTHXlzqdavVRJo 4uJ1QyW/pCV4W9MvAHEVGl3+NqB9H0z7NuLAPTklBikfgSWMepNihkkqxZVhg5UO9Kza 0PNHOAkXEOuDcARJ29TpRkBoKezChrezbR7rrUJNYd/l4OYz2cfEzQxgfx2Pk+HYn7VF dKAi5Dtsc3WsUzNGZ5cQotkvBh8RAkojcGYIQlDoR7Z9+Ftn+6X2AKEH/MrNYuBiuAW7 EHiMjyGwJJcVNGu8c/CeS5KSllhP5svbCBNEuCuKb7oS+/Lies5PLPC0CzdXjABH5Pq9 RUcw== 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=V1Yr8Xrk/V7tCxcV77RYNJ3kZOXcGIoepFSKSHixKdlBGoLuZ2KtQLVbF0RiVTxwh+ Jhmz/ROcwG6jq6vAOwmhOE3ponveGn6H53aHLtGIKwntmz4+LmU16pBtBpII17McaHNx 2SS/gK2C7HsUJm+DRYFueTz8jdwG5lO0cxXUfaaYOdF/Urh3E0bW5vrzmx//pFteMbn3 4iY32IUB6+eNhJK9MLT1cn5/9N3fj6zI3bNEdniZGnsp/PALWc/UJ/wuABvoQWOSz7st /7TkyaeIX64Np32oO4bvF1OiG5BqTb5pGVoF+6+jfGVYQRMvH+epKOK+Sr6sjun+yhRf XBHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=HQ3g+iHf; 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 d142si6558363itd.51.2018.01.22.12.20.04; Mon, 22 Jan 2018 12:20:17 -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=HQ3g+iHf; 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 S1751786AbeAVUOK (ORCPT + 99 others); Mon, 22 Jan 2018 15:14:10 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:38905 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751733AbeAVUOD (ORCPT ); Mon, 22 Jan 2018 15:14:03 -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=HQ3g+iHfQAJGQzmlRT2VURmhE NGfmSVVISqL0LgUGsIvmlB0c95n6dwW89RshQheMEdBwlCJbBj68+EQJ9lcdjnSHT7t3H4jlq65WH mO4ggXRGgVJgqiW2xEfqlPdP0t1c2FjhAqRIcOGDFOEQ6dlRhmiB7yY2+7tKKydmw8NPml79EMM5Q ilgkDXMp+Qu4wV/Q++KQ6qcB+E6+R3JUmSJWX/Sqa/dgy4abrzC1n68WXzm+mBNBA5ypHN7FgvBUA FEiWsG9goYwe2lIg5TUwwoXLR6Vrf0/KDscgWnbRqgzS+Hn5JOFRyuGAvdKJUoRNRJogzIcaxpIAP bKWswO/+w==; 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 1ediTh-0007hd-Dq; Mon, 22 Jan 2018 20:14:01 +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: Mon, 22 Jan 2018 21:12:30 +0100 Message-Id: <20180122201243.31610-24-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/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