From: Jon Maloy <jon.maloy@ericsson.com>
To: Christoph Hellwig <hch@lst.de>,
        "viro@zeniv.linux.org.uk" <viro@zeniv.linux.org.uk>
CC: Avi Kivity <avi@scylladb.com>,
        "linux-aio@kvack.org" <linux-aio@kvack.org>,
        "linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-api@vger.kernel.org" <linux-api@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH 13/32] net/tipc: convert to ->poll_mask
Thread-Topic: [PATCH 13/32] net/tipc: convert to ->poll_mask
Thread-Index: AQHTii0zm9eYs9ZaekCRehxtkA/DDKNtfvqw
Date: Wed, 10 Jan 2018 19:32:21 +0000
Message-ID: <AM4PR07MB1714F63B2A751F97C3969C179A110@AM4PR07MB1714.eurprd07.prod.outlook.com>
References: <20180110155853.32348-1-hch@lst.de>
 <20180110155853.32348-14-hch@lst.de>
In-Reply-To: <20180110155853.32348-14-hch@lst.de>
Accept-Language: en-US
Content-Language: en-US
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: cefe796c-bbed-47b8-30aa-08d55860df03
X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jan 2018 19:32:22.3332
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 92e84ceb-fbfd-47ab-be52-080c6b87953f
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR07MB3426
X-OriginatorOrg: ericsson.com
X-Brightmail-Tracker: H4sIAAAAAAAAA02SaUhUURTHuW/zOTV1G7eDadDQai6pUU8SKfoyYWYmDDkUOeVLTZ1knpr2
        IUwzXJJMwi3FsUXLqUyz1NFKx7G0ICmTsCgox3LJJSUM15x5Bn37nfP/n3v+93JZUlZDO7PR
        mgReq1HHyhkJVXykYbNH4GmlavtUMpd3ZYDm7uo7CO5aQRriHk1nMlzL0y6K6zGUMtwLnSPX
        Pf+S3sMq6ibzbRTNfamM4knpEK2YqlunqDOPEodolcQ/go+NTuK1XgHhkqhfjV+Y+AHH5Omf
        kIrKZNnIlgW8A1o/pdpkIwkrw+0IhlvaCbHoRFD9fI60FBTOJcGYXkOLSgEBhfO1NpZ5Ge5H
        8Gn8lIUZvAWGCjKRhe1xGCwY0qxHkdhEwPysgbEIdng3/GmqpUSTP3w2mmiRfWDufYbVQ+GN
        8C3jg5Wl+CgY+8yEuEwJnbpB66wt9oY3rRetyxB2hOlX96weEjvBR3M5IV4Ow62WblJkBxjq
        X6BFXg/dD28s913hXXkOsgQFXE9AnqGXEQVPeHx1FIkcBFWtGYRoeotg8fZ3ShTcYMxUtnQq
        u5QiDF4PhIntGKgarVhe4AdTDeblWT0JnwezllO4QPVwCZWHvEr+Cy6yO+iaJxmRt0FlxQhZ
        Yn2MNdBVbKZ0iKpGDgIvCHGRPr6evDb6pCCc0Xhq+IQ6tPSN2upnPRqRfmSvEWEWyVdKQ0KV
        KhmtThJS4owIWFJuL70ZstSSRqhTzvHaM8e1ibG8YERrWUruJO3aL1XJcKQ6gY/h+Xhe+08l
        WFvnVBQdtiH9xH0UrHMxqPw0P+orQuO3ckWwaaP79dGUopHCZw/sXMYSZvBBvUmJbVeslgRy
        IfLLM2f1iwPUTGdiz0SM79y3r3dOrnKdOPA7Ilw6V9lAZ3lVjdg1Ez6Xdpq6g4P35Yw/zz9/
        uP5YrnBB86Wj6WbALokup60pSOgtcKXllBCl9nYjtYL6L0FqJLpCAwAA
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Return-Path: <linux-kernel-owner@vger.kernel.org>

Acked.
///jon

> -----Original Message-----
> From: netdev-owner@vger.kernel.org [mailto:netdev-
> owner@vger.kernel.org] On Behalf Of Christoph Hellwig
> Sent: Wednesday, January 10, 2018 10:59
> To: viro@zeniv.linux.org.uk
> Cc: Avi Kivity <avi@scylladb.com>; 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 13/32] net/tipc: convert to ->poll_mask
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  net/tipc/socket.c | 14 +++++---------
>  1 file changed, 5 insertions(+), 9 deletions(-)
> 
> diff --git a/net/tipc/socket.c b/net/tipc/socket.c index
> fcbd6489a8b5..527d113c38b0 100644
> --- a/net/tipc/socket.c
> +++ b/net/tipc/socket.c
> @@ -693,10 +693,9 @@ static int tipc_getname(struct socket *sock, struct
> sockaddr *uaddr,  }
> 
>  /**
> - * tipc_poll - read and possibly block on pollmask
> + * tipc_poll - read pollmask
>   * @file: file structure associated with the socket
>   * @sock: socket for which to calculate the poll bits
> - * @wait: ???
>   *
>   * Returns pollmask value
>   *
> @@ -710,16 +709,13 @@ static int tipc_getname(struct socket *sock, struct
> sockaddr *uaddr,
>   * imply that the operation will succeed, merely that it should be performed
>   * and will not block.
>   */
> -static __poll_t tipc_poll(struct file *file, struct socket *sock,
> -			      poll_table *wait)
> +static __poll_t tipc_poll_mask(struct socket *sock, __poll_t events)
>  {
>  	struct sock *sk = sock->sk;
>  	struct tipc_sock *tsk = tipc_sk(sk);
>  	struct tipc_group *grp = tsk->group;
>  	__poll_t revents = 0;
> 
> -	sock_poll_wait(file, sk_sleep(sk), wait);
> -
>  	if (sk->sk_shutdown & RCV_SHUTDOWN)
>  		revents |= POLLRDHUP | POLLIN | POLLRDNORM;
>  	if (sk->sk_shutdown == SHUTDOWN_MASK)
> @@ -3005,7 +3001,7 @@ static const struct proto_ops msg_ops = {
>  	.socketpair	= tipc_socketpair,
>  	.accept		= sock_no_accept,
>  	.getname	= tipc_getname,
> -	.poll		= tipc_poll,
> +	.poll_mask	= tipc_poll_mask,
>  	.ioctl		= tipc_ioctl,
>  	.listen		= sock_no_listen,
>  	.shutdown	= tipc_shutdown,
> @@ -3026,7 +3022,7 @@ static const struct proto_ops packet_ops = {
>  	.socketpair	= tipc_socketpair,
>  	.accept		= tipc_accept,
>  	.getname	= tipc_getname,
> -	.poll		= tipc_poll,
> +	.poll_mask	= tipc_poll_mask,
>  	.ioctl		= tipc_ioctl,
>  	.listen		= tipc_listen,
>  	.shutdown	= tipc_shutdown,
> @@ -3047,7 +3043,7 @@ static const struct proto_ops stream_ops = {
>  	.socketpair	= tipc_socketpair,
>  	.accept		= tipc_accept,
>  	.getname	= tipc_getname,
> -	.poll		= tipc_poll,
> +	.poll_mask	= tipc_poll_mask,
>  	.ioctl		= tipc_ioctl,
>  	.listen		= tipc_listen,
>  	.shutdown	= tipc_shutdown,
> --
> 2.14.2