From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3731766-1522424168-2-12802268001507409333 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.249, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enroda, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='de', MailFrom='org' X-Spam-charsets: X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: linux-api-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1522424167; b=QTlUyXQQ+CB90FbFdkkMD8h1ZuPDT/gw26TkaCM/eQKJ8Y+XsA ejuSr0PgImxsjG0ohYLIVgZJoNYc/gRWciNu7+CDLek3rpiDNL4yVXcwL2XGhSNW iQqoISJPmPEoJDoGtm+k/+V0MJdsg//IeH0HzbfTlpDXI/Pkyq6TJv3dwz5DnKiU DVg/tL5Ey+n6o4X5oKolIdDkzEylEeEIrrsjYIE+1kZ4FcGZnPzk7c/zegYCc4Nd B/T64iB3aXjXwXcERXYij9IhRMVpAs2c3JaokYYT5h5CkHx8A43o0XnRxHlSw+Dz nFrgPLytubrhflmnbT05EXkywm05RzPf7WMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:sender:list-id; s=fm2; t=1522424167; bh= p1HJOkyOeQwlzEn3hlJu/MyaKWYPAu8UPncul/PW6Zw=; b=FPhAwspUGrpSZuzg wOu6ACfzIM4lpgsBtQMCAhesFHFYVU9GwYoBPaXK2HTlqZuUlLqmvUQkB5vfYB1H iQaBmm1DJaqdwLuY8IlmmeqcOcLP412cdgLu4mHm2AGR1OsCUQxpBokSbAE2hGVW h8NMQ0hDFjcuNC2MR5Nc/kA553PbLVXxwLT1ZGI9qDbROV9m7S2RiMvaHFrt7LxK RFweOxRtLE5NGci6+hvSuW6AZf6bykvdnYVy8LyAIhbUdXsk+wZSShRqZJUc3rjt MDJmwH+ktMX/JryhB3SILESjKQXA3NtVAG1fzWS0sLtCwbCDQdYdgjtzukoCJkFi ELz2hA== ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered, 2048-bit rsa key sha256) header.d=infradead.org header.i=@infradead.org header.b=pvoBtc83 x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=bombadil.20170209; dmarc=none (p=none,has-list-id=yes,d=none) header.from=lst.de; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-api-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=lst.de header.result=pass header_is_org_domain=yes; x-vs=clean score=0 state=0 Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered, 2048-bit rsa key sha256) header.d=infradead.org header.i=@infradead.org header.b=pvoBtc83 x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=bombadil.20170209; dmarc=none (p=none,has-list-id=yes,d=none) header.from=lst.de; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-api-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=lst.de header.result=pass header_is_org_domain=yes; x-vs=clean score=0 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfPVRxFuXHZgDB0VGOA9CbqPuxgOvahgD2kFWtyPaMU/oKVPpLePIVZFWz1tIQK2sgh3xjk5yAFr4ze4+VOFIUFLR0oUWdwqhqy3c4ireP4TzdhhGuRTZ w4ebEzZcfzhaH6Rv75xe0SLKdBuGIn1AnsO9j6cLkkIEo5LGbaeQsbG6Ornw9SEDpi14Pq8R0FbzmPR9c64shDqTykLYOnyhR5Don//7AbKQHQQL0gqAbAyc X-CM-Analysis: v=2.3 cv=JLoVTfCb c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=v2DPQv5-lfwA:10 a=ag1SF4gXAAAA:8 a=yPCof4ZbAAAA:8 a=VwQbUJbxAAAA:8 a=sdapQSm_P28a7qtZbq0A:9 a=x8gzFH9gYPwA:10 a=Yupwre4RP9_Eg_Bd0iYG:22 a=AjGcO6oz07-iQ99wixmX:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753247AbeC3Pe3 (ORCPT ); Fri, 30 Mar 2018 11:34:29 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:42738 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753228AbeC3PeZ (ORCPT ); Fri, 30 Mar 2018 11:34:25 -0400 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 02/32] fs: cleanup do_pollfd Date: Fri, 30 Mar 2018 17:07:39 +0200 Message-Id: <20180330150809.28094-3-hch@lst.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180330150809.28094-1-hch@lst.de> References: <20180330150809.28094-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-api-owner@vger.kernel.org X-Mailing-List: linux-api@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Use straightline code with failure handling gotos instead of a lot of nested conditionals. Signed-off-by: Christoph Hellwig Reviewed-by: Greg Kroah-Hartman Reviewed-by: Darrick J. Wong --- fs/select.c | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/fs/select.c b/fs/select.c index 686de7b3a1db..c6c504a814f9 100644 --- a/fs/select.c +++ b/fs/select.c @@ -806,34 +806,32 @@ static inline __poll_t do_pollfd(struct pollfd *pollfd, poll_table *pwait, bool *can_busy_poll, __poll_t busy_flag) { - __poll_t mask; - int fd; - - mask = 0; - fd = pollfd->fd; - if (fd >= 0) { - struct fd f = fdget(fd); - mask = EPOLLNVAL; - if (f.file) { - /* userland u16 ->events contains POLL... bitmap */ - __poll_t filter = demangle_poll(pollfd->events) | - EPOLLERR | EPOLLHUP; - mask = DEFAULT_POLLMASK; - if (f.file->f_op->poll) { - pwait->_key = filter; - pwait->_key |= busy_flag; - mask = f.file->f_op->poll(f.file, pwait); - if (mask & busy_flag) - *can_busy_poll = true; - } - /* Mask out unneeded events. */ - mask &= filter; - fdput(f); - } + int fd = pollfd->fd; + __poll_t mask = 0, filter; + struct fd f; + + if (fd < 0) + goto out; + mask = EPOLLNVAL; + f = fdget(fd); + if (!f.file) + goto out; + + /* userland u16 ->events contains POLL... bitmap */ + filter = demangle_poll(pollfd->events) | EPOLLERR | EPOLLHUP; + mask = DEFAULT_POLLMASK; + if (f.file->f_op->poll) { + pwait->_key = filter | busy_flag; + mask = f.file->f_op->poll(f.file, pwait); + if (mask & busy_flag) + *can_busy_poll = true; } + mask &= filter; /* Mask out unneeded events. */ + fdput(f); + +out: /* ... and so does ->revents */ pollfd->revents = mangle_poll(mask); - return mask; } -- 2.14.2