From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756871AbdCXVhs (ORCPT ); Fri, 24 Mar 2017 17:37:48 -0400 Received: from mail-yw0-f196.google.com ([209.85.161.196]:33721 "EHLO mail-yw0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756588AbdCXVhB (ORCPT ); Fri, 24 Mar 2017 17:37:01 -0400 From: Jes Sorensen X-Google-Original-From: Jes Sorensen To: linux-kernel@vger.kernel.org Cc: john@johnmccutchan.com, rlove@rlove.org, eparis@parisplace.org, josef@toxicpanda.com, kernel-team@fb.com, Jes Sorensen Subject: [PATCH 4/5] inotify: switch get_one_event() to use fsnotify_list_*() helpers Date: Fri, 24 Mar 2017 17:36:37 -0400 Message-Id: <20170324213638.9114-5-jsorensen@fb.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170324213638.9114-1-jsorensen@fb.com> References: <20170324213638.9114-1-jsorensen@fb.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Preparing to switch inotify to code not taking the spinlock for each event in read() Signed-off-by: Jes Sorensen Reviewed-by: Josef Bacik --- fs/notify/inotify/inotify_user.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c index 6f5b360..4a93750 100644 --- a/fs/notify/inotify/inotify_user.c +++ b/fs/notify/inotify/inotify_user.c @@ -138,18 +138,18 @@ static int round_event_name_len(struct fsnotify_event *fsn_event) * * Called with the group->notification_lock held. */ -static struct fsnotify_event *get_one_event(struct fsnotify_group *group, +static struct fsnotify_event *get_one_event(struct list_head *notification_list, size_t count) { size_t event_size = sizeof(struct inotify_event); struct fsnotify_event *event; - if (fsnotify_notify_queue_is_empty(group)) + if (list_empty(notification_list)) return NULL; - event = fsnotify_peek_first_event(group); + event = fsnotify_list_peek_first_event(notification_list); - pr_debug("%s: group=%p event=%p\n", __func__, group, event); + pr_debug("%s: event=%p\n", __func__, event); event_size += round_event_name_len(event); if (event_size > count) @@ -157,7 +157,7 @@ static struct fsnotify_event *get_one_event(struct fsnotify_group *group, /* held the notification_lock the whole time, so this is the * same event we peeked above */ - fsnotify_remove_first_event(group); + fsnotify_list_remove_first_event(notification_list); return event; } @@ -234,7 +234,7 @@ static ssize_t inotify_read(struct file *file, char __user *buf, add_wait_queue(&group->notification_waitq, &wait); while (1) { spin_lock(&group->notification_lock); - kevent = get_one_event(group, count); + kevent = get_one_event(&group->notification_list, count); spin_unlock(&group->notification_lock); pr_debug("%s: group=%p kevent=%p\n", __func__, group, kevent); -- 2.9.3