Received: by 10.223.148.5 with SMTP id 5csp6272843wrq; Wed, 17 Jan 2018 11:33:28 -0800 (PST) X-Google-Smtp-Source: ACJfBos3CeXBiZQMOlG90/+/N92DAnSAuzpRfecHqpcBY7MiW+xj5O/aqRwqdvk2c4ZxnVoU/QMf X-Received: by 10.84.128.103 with SMTP id 94mr18093580pla.183.1516217608885; Wed, 17 Jan 2018 11:33:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516217608; cv=none; d=google.com; s=arc-20160816; b=ujozxgO6nFVkjukMLVq3gfshmShsY2CXwOD532UiOzuGR4YlXT9KSlaZA1OSZE/F6u 1k+2QXO2jlzriNRJPkqHW1UEIfFMe8Ot9kbtGNd/yN30znEKqk2wtw1QoejkUoeimTzB qqfKN72z+iC1bTAeq8hi6HTyWZeYSHW8OVDQ553JtGmnSiN1JhPm/RyF6+mQ97V3FSTC +EuG7X9SOq8TArl+vty6KXbKeUc++YVuFwl7etJb/nhlEx6/nyWGJ9RNCkwHKppjLThq ZPEjI97azjZ09rEe97MhiE63R1XhjuNbILVwPX5u+BGPgitLspD4fo5HfpT0wy7C1WpV jMwA== 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=EXsZjJr+D+94/Ay4dXjRGyfgjcGLS5u3/n6dLcib8YY=; b=oP6DGJCT/CA+LfnQPqHi+CZ6c94/6WZdIX5if9xw5I/+L2pXyB3pz1d3Man4C6K0Ki i85C7joChh6LKmVb9f2yckmHCC9hSmZKgscfkp8bO6rWD0U+PRM75WAFktSpMKn03Jg8 ijvtAcnl1QyH7coHkS7FbIHicQPiiNbDNvQ3vEnRp0wFk498RNJj3kBztTVnvfb8PoqH CjyLjP6y0w67L/D+hi8mksgRQwxPUNhXNkWJvDGgEW8cvxTf9jmXrx8+2BDEeLXmCa78 HB3P8gMlccp8Tni0r5mYefcB34g1n+yinSGJPx6kO9RpQ3afRVggzHNGkNL3RFchbX6s Nzfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=CWiD+CId; 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 1si5012160plp.678.2018.01.17.11.33.14; Wed, 17 Jan 2018 11:33:28 -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=CWiD+CId; 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 S1754232AbeAQT3g (ORCPT + 99 others); Wed, 17 Jan 2018 14:29:36 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:54423 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753915AbeAQT3d (ORCPT ); Wed, 17 Jan 2018 14:29:33 -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=EXsZjJr+D+94/Ay4dXjRGyfgjcGLS5u3/n6dLcib8YY=; b=CWiD+CIdYy/o6tEOX9WnnW6Ob RCAUmVeWkk88xaAuYFPI8i4oo52n4TNMH+2+GaCVwhylpindr0PstWitGe/FE4jlaKr1glgkAibcm fmGqVE6swn/wlbmUEm/zlNhEe+k3l1myNbcoAsP7NRiPWroMW1ta+Mkb5NOsFJIRWIaQB70jQ45FF 5gH6H5PpIFvChpN2tAuGGLTOAfz6emaw7K2fL5Qq9qNXvcY8lNUtZNEMjk4fuT/D5g8GDxy/BnI9Q A6vBwWrYw2FlVln/F/D2m4oxfYnTr/f2K9f0LFlq9zcJu3DUz3dVdA0jV64KR1AriiJMBVBPtE+t4 8r+G9h96w==; 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 1ebtOt-0003P6-4P; Wed, 17 Jan 2018 19:29:31 +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 30/36] net/iucv: convert to ->poll_mask Date: Wed, 17 Jan 2018 20:27:36 +0100 Message-Id: <20180117192742.710-31-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 --- include/net/iucv/af_iucv.h | 2 -- net/iucv/af_iucv.c | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h index f4c21b5a1242..b0eaeb02d46d 100644 --- a/include/net/iucv/af_iucv.h +++ b/include/net/iucv/af_iucv.h @@ -153,8 +153,6 @@ struct iucv_sock_list { atomic_t autobind_name; }; -__poll_t iucv_sock_poll(struct file *file, struct socket *sock, - poll_table *wait); void iucv_sock_link(struct iucv_sock_list *l, struct sock *s); void iucv_sock_unlink(struct iucv_sock_list *l, struct sock *s); void iucv_accept_enqueue(struct sock *parent, struct sock *sk); diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index 64331158d693..da2043d1b322 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c @@ -1489,14 +1489,11 @@ static inline __poll_t iucv_accept_poll(struct sock *parent) return 0; } -__poll_t iucv_sock_poll(struct file *file, struct socket *sock, - poll_table *wait) +static __poll_t iucv_sock_poll_mask(struct socket *sock, __poll_t events) { struct sock *sk = sock->sk; __poll_t mask = 0; - sock_poll_wait(file, sk_sleep(sk), wait); - if (sk->sk_state == IUCV_LISTEN) return iucv_accept_poll(sk); @@ -2389,7 +2386,7 @@ static const struct proto_ops iucv_sock_ops = { .getname = iucv_sock_getname, .sendmsg = iucv_sock_sendmsg, .recvmsg = iucv_sock_recvmsg, - .poll = iucv_sock_poll, + .poll_mask = iucv_sock_poll_mask, .ioctl = sock_no_ioctl, .mmap = sock_no_mmap, .socketpair = sock_no_socketpair, -- 2.14.2