Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp7022809imu; Wed, 14 Nov 2018 10:26:32 -0800 (PST) X-Google-Smtp-Source: AJdET5cwHOkVhChxB4Dw7x2XGoXzKP/mMl42ZQpcaM0mMkHnJwilsloSAPLNPsaZLe5hR1r/Ovnf X-Received: by 2002:a17:902:15a8:: with SMTP id m37-v6mr2997055pla.256.1542219991977; Wed, 14 Nov 2018 10:26:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542219991; cv=none; d=google.com; s=arc-20160816; b=ICd5Lcj6FM1uXAsxIQe8jpJWpHdNrf2KsAfbXwvqmD/doGhsPc/dMCHVyer4wfXzJK 7Hi74b5fmx1mwZRUa7hqjA3SinHNe8wMbT/VPaQa7pEfau//QV1filRk7NRCTxm+xlvj ezAsjBrKfamuHRIsN3TShtkz2U48AakbPDGVVzuZFZoaEl3zngbYNWrwAJTUMbGpVD3w d9c4FzK8PzE04wF9fTTOuaVbWNKQeCLgcY/MAvwSy3rWOe6bw0LFlnFSzJrS+BXKwRIy NLox76V29zxwdeJz3OAVO/vw65q1ER5SPsHTkOABld5knF6oZcZFQ/HYtwXb+6lmn8/p EX1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=hs0SPdgBr0xHxUlMgEPOql7Z6C7uqEftK8lp/+v5or4=; b=dNpd2VrDhtxdRAxSKyN4r1GrMGbu1FKHejU1d2ayWQPPnjcI75ccnplV915Z4G2uvw aSu7/oxFEhXHt+d50EomoCFEclBizL4zgK1u0ZQobUaU7Ams8mo8jEzNkV1SogSlBW7+ MOR2ZJJaHBq/LwzZvL4U3wn6buZiOwkA9HbJHNvc3exmuwHaX1qtO7GY3UbVqOUf4lj+ 77GDo1Fialcg74nCfsiQSHfV+wCP/yM32YUaIWAW11bMI1LBB/yRTCi5bKbQz0ubE/K9 PZlJJuC64zBXEmfGm1xbIRKLUGSj8TebOTla2KySW8qZCNU98/O+P/1y2KaH/MXKvZ76 zFdw== ARC-Authentication-Results: i=1; mx.google.com; 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 o13-v6si28218871pfd.46.2018.11.14.10.26.15; Wed, 14 Nov 2018 10:26:31 -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; 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 S1728116AbeKOEaB (ORCPT + 99 others); Wed, 14 Nov 2018 23:30:01 -0500 Received: from smtp2.provo.novell.com ([137.65.250.81]:40724 "EHLO smtp2.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727576AbeKOEaB (ORCPT ); Wed, 14 Nov 2018 23:30:01 -0500 Received: from localhost.localdomain (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by smtp2.provo.novell.com with ESMTP (TLS encrypted); Wed, 14 Nov 2018 11:25:42 -0700 From: Davidlohr Bueso To: akpm@linux-foundation.org Cc: jbaron@akamai.com, viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, dave@stgolabs.net, Davidlohr Bueso Subject: [PATCH 1/2] fs/epoll: rename check_events label to send_events Date: Wed, 14 Nov 2018 10:25:31 -0800 Message-Id: <20181114182532.27981-1-dave@stgolabs.net> X-Mailer: git-send-email 2.16.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It is currently called check_events because it, well, did exactly that. However, since the lockless ep_events_available() call, the label no longer checks, but just sends the events. Rename as such. Signed-off-by: Davidlohr Bueso --- Both patch 1 and 2 apply on top of the mmots. fs/eventpoll.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index ec14e5bcdaa9..7e2b5f3d6b3e 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -1774,7 +1774,7 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events, eavail = ep_events_available(ep); spin_unlock_irq(&ep->wq.lock); - goto check_events; + goto send_events; } fetch_events: @@ -1784,7 +1784,7 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events, eavail = ep_events_available(ep); if (eavail) - goto check_events; + goto send_events; /* * Busy poll timed out. Drop NAPI ID for now, we can add @@ -1840,7 +1840,7 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events, __remove_wait_queue(&ep->wq, &wait); spin_unlock_irq(&ep->wq.lock); -check_events: +send_events: /* * Try to transfer events to user space. In case we get 0 events and * there's still timeout left over, we go trying again in search of -- 2.16.4