From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752861AbeAFTQ1 (ORCPT + 1 other); Sat, 6 Jan 2018 14:16:27 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:40084 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751488AbeAFTQZ (ORCPT ); Sat, 6 Jan 2018 14:16:25 -0500 Date: Sat, 6 Jan 2018 19:16:22 +0000 From: Al Viro To: Christoph Hellwig Cc: Avi Kivity , linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 04/31] net: add support for ->poll_mask in proto_ops Message-ID: <20180106191622.GJ21978@ZenIV.linux.org.uk> References: <20180104080043.14506-1-hch@lst.de> <20180104080043.14506-5-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180104080043.14506-5-hch@lst.de> User-Agent: Mutt/1.9.0 (2017-09-02) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On Thu, Jan 04, 2018 at 09:00:16AM +0100, Christoph Hellwig wrote: > The socket file operations still implement ->poll until all protocols are > switched over. > > Signed-off-by: Christoph Hellwig > --- > include/linux/net.h | 3 +++ > net/socket.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++---- > 2 files changed, 60 insertions(+), 4 deletions(-) > > diff --git a/include/linux/net.h b/include/linux/net.h > index c2d468cb9821..94d65de30cb7 100644 > --- a/include/linux/net.h > +++ b/include/linux/net.h > @@ -147,6 +147,9 @@ struct proto_ops { > int (*getname) (struct socket *sock, > struct sockaddr *addr, > int *sockaddr_len, int peer); > + void (*pre_poll) (const struct sock *sk); Description? Or more descriptive name, for that matter... > + __poll_t (*poll_mask) (struct file *file, struct socket *sock, > + __poll_t events); Does that sucker need struct file?