From patchwork Thu Oct 19 13:58:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miklos Szeredi X-Patchwork-Id: 10017089 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E4F20600CC for ; Thu, 19 Oct 2017 13:58:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE8C128D59 for ; Thu, 19 Oct 2017 13:58:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D36E828D61; Thu, 19 Oct 2017 13:58:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5872A28D59 for ; Thu, 19 Oct 2017 13:58:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754856AbdJSN6t (ORCPT ); Thu, 19 Oct 2017 09:58:49 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:54010 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754881AbdJSN6q (ORCPT ); Thu, 19 Oct 2017 09:58:46 -0400 Received: by mail-wm0-f66.google.com with SMTP id q132so16603619wmd.2 for ; Thu, 19 Oct 2017 06:58:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1PStPHveTU3FLx6DfGBRoztqmsc9vr5jaJLGtR1TzvQ=; b=L8C7COnJjBC8/4GWRTyBVoDrKGgry2+1m8onckvgugDelgvwOzae4ahbws7aWbifHZ tzTaGaY4IvwpyS0N0A28zqjq3RZjcmpZAN/OvjXVplwxnusE2PULXjpNo0LNVuup3Z6x OmKUjsYQSz7N/OKPl70IN1s0AE2nusbfaYX8zFOrv1xisyjAit30vzZc0U7UIveOVqyh RYgaWkGSGVfoj3fEWFhppVczDpen7huNWfvYBk/OK9m+AYOrRsR2B+pGBfkHn+rUpvsD gG29EywjAwQ0bFk9v13yti7izemNgyN6dEKCHzgSnLTK3odrN6/fPLFgJrdq79x+yImy VGfQ== X-Gm-Message-State: AMCzsaXY4mwSkSkDSD8kI2qA8mg7DC2hYD/bTZgYusn3MSr8fy9DA5sD Ps8dDc4b8rpN2pHIQoKWZru6T2qmGpI= X-Google-Smtp-Source: ABhQp+QgmzOW0WcTuHlntEQSIi+md9goIrMd9AWwMFh+ZroSUNQWI+ZC3383sGJjLwMWSbH9BOm5Cg== X-Received: by 10.28.55.2 with SMTP id e2mr1912919wma.60.1508421524512; Thu, 19 Oct 2017 06:58:44 -0700 (PDT) Received: from veci.piliscsaba.szeredi.hu (catv-176-63-54-97.catv.broadband.hu. [176.63.54.97]) by smtp.gmail.com with ESMTPSA id h185sm3613279wma.19.2017.10.19.06.58.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Oct 2017 06:58:44 -0700 (PDT) From: Miklos Szeredi To: linux-fsdevel@vger.kernel.org Cc: Jan Kara , Amir Goldstein , Xiong Zhou , linux-kernel@vger.kernel.org Subject: [PATCH 4/4] fsnotify: clean up fsnotify() Date: Thu, 19 Oct 2017 15:58:37 +0200 Message-Id: <1508421517-22678-5-git-send-email-mszeredi@redhat.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1508421517-22678-1-git-send-email-mszeredi@redhat.com> References: <1508421517-22678-1-git-send-email-mszeredi@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use helpers to get first and next marks from connector. Also get rid of inode_node/vfsmount_node local variables, which just refers to the same objects as iter_info. There was an srcu_dereference() for foo_node, but that's completely superfluous since we've already done it when obtaining foo_node. Also get rid of inode_group/vfsmount_group local variables; checking against non-NULL for these is the same as checking against non-NULL inode_mark/vfsmount_mark. Signed-off-by: Miklos Szeredi --- fs/notify/fsnotify.c | 107 +++++++++++++++++++++++---------------------------- 1 file changed, 48 insertions(+), 59 deletions(-) diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c index 0ab6a7179e4d..7490edd74883 100644 --- a/fs/notify/fsnotify.c +++ b/fs/notify/fsnotify.c @@ -243,6 +243,28 @@ static int send_to_group(struct inode *to_tell, file_name, cookie, iter_info); } +static struct fsnotify_mark *fsnotify_first_mark(struct fsnotify_mark_connector **connp) +{ + struct fsnotify_mark_connector *conn; + struct hlist_node *node = NULL; + + conn = srcu_dereference(*connp, &fsnotify_mark_srcu); + if (conn) + node = srcu_dereference(conn->list.first, &fsnotify_mark_srcu); + + return hlist_entry_safe(node, struct fsnotify_mark, obj_list); +} + +static struct fsnotify_mark *fsnotify_next_mark(struct fsnotify_mark *mark) +{ + struct hlist_node *node = NULL; + + if (mark) + node = srcu_dereference(mark->obj_list.next, &fsnotify_mark_srcu); + + return hlist_entry_safe(node, struct fsnotify_mark, obj_list); +} + /* * This is the main call to fsnotify. The VFS calls into hook specific functions * in linux/fsnotify.h. Those functions then in turn call here. Here will call @@ -252,11 +274,7 @@ static int send_to_group(struct inode *to_tell, int fsnotify(struct inode *to_tell, __u32 mask, const void *data, int data_is, const unsigned char *file_name, u32 cookie) { - struct hlist_node *inode_node = NULL, *vfsmount_node = NULL; - struct fsnotify_mark *inode_mark = NULL, *vfsmount_mark = NULL; - struct fsnotify_group *inode_group, *vfsmount_group; - struct fsnotify_mark_connector *inode_conn, *vfsmount_conn; - struct fsnotify_iter_info iter_info; + struct fsnotify_iter_info iter_info = { NULL, NULL }; struct mount *mnt; int ret = 0; /* global tests shouldn't care about events on child only the specific event */ @@ -291,26 +309,13 @@ int fsnotify(struct inode *to_tell, __u32 mask, const void *data, int data_is, if ((mask & FS_MODIFY) || (test_mask & to_tell->i_fsnotify_mask)) { - inode_conn = srcu_dereference(to_tell->i_fsnotify_marks, - &fsnotify_mark_srcu); - if (inode_conn) - inode_node = srcu_dereference(inode_conn->list.first, - &fsnotify_mark_srcu); + iter_info.inode_mark = fsnotify_first_mark(&to_tell->i_fsnotify_marks); } if (mnt && ((mask & FS_MODIFY) || (test_mask & mnt->mnt_fsnotify_mask))) { - inode_conn = srcu_dereference(to_tell->i_fsnotify_marks, - &fsnotify_mark_srcu); - if (inode_conn) - inode_node = srcu_dereference(inode_conn->list.first, - &fsnotify_mark_srcu); - vfsmount_conn = srcu_dereference(mnt->mnt_fsnotify_marks, - &fsnotify_mark_srcu); - if (vfsmount_conn) - vfsmount_node = srcu_dereference( - vfsmount_conn->list.first, - &fsnotify_mark_srcu); + iter_info.inode_mark = fsnotify_first_mark(&to_tell->i_fsnotify_marks); + iter_info.vfsmount_mark = fsnotify_first_mark(&mnt->mnt_fsnotify_marks); } /* @@ -318,41 +323,28 @@ int fsnotify(struct inode *to_tell, __u32 mask, const void *data, int data_is, * ignore masks are properly reflected for mount mark notifications. * That's why this traversal is so complicated... */ - while (inode_node || vfsmount_node) { - inode_group = NULL; - inode_mark = NULL; - vfsmount_group = NULL; - vfsmount_mark = NULL; - - if (inode_node) { - inode_mark = hlist_entry(srcu_dereference(inode_node, &fsnotify_mark_srcu), - struct fsnotify_mark, obj_list); - inode_group = inode_mark->group; - if (!(inode_mark->flags & FSNOTIFY_MARK_FLAG_ATTACHED)) - goto skip_inode; - } + while (iter_info.inode_mark || iter_info.vfsmount_mark) { + struct fsnotify_mark *inode_mark = iter_info.inode_mark; + struct fsnotify_mark *vfsmount_mark = iter_info.vfsmount_mark; - if (vfsmount_node) { - vfsmount_mark = hlist_entry(srcu_dereference(vfsmount_node, &fsnotify_mark_srcu), - struct fsnotify_mark, obj_list); - vfsmount_group = vfsmount_mark->group; - if (!(vfsmount_mark->flags & FSNOTIFY_MARK_FLAG_ATTACHED)) - goto skip_vfsmount; + if (inode_mark && + !(inode_mark->flags & FSNOTIFY_MARK_FLAG_ATTACHED)) { + vfsmount_mark = NULL; + goto skip; + } + if (vfsmount_mark && + !(vfsmount_mark->flags & FSNOTIFY_MARK_FLAG_ATTACHED)) { + inode_mark = NULL; + goto skip; } - iter_info.inode_mark = inode_mark; - iter_info.vfsmount_mark = vfsmount_mark; - - if (inode_group && vfsmount_group) { - int cmp = fsnotify_compare_groups(inode_group, - vfsmount_group); - if (cmp > 0) { - inode_group = NULL; + if (inode_mark && vfsmount_mark) { + int cmp = fsnotify_compare_groups(inode_mark->group, + vfsmount_mark->group); + if (cmp > 0) inode_mark = NULL; - } else if (cmp < 0) { - vfsmount_group = NULL; + else if (cmp < 0) vfsmount_mark = NULL; - } } ret = send_to_group(to_tell, inode_mark, vfsmount_mark, mask, @@ -361,14 +353,11 @@ int fsnotify(struct inode *to_tell, __u32 mask, const void *data, int data_is, if (ret && (mask & ALL_FSNOTIFY_PERM_EVENTS)) goto out; -skip_inode: - if (inode_group) - inode_node = srcu_dereference(inode_node->next, - &fsnotify_mark_srcu); -skip_vfsmount: - if (vfsmount_group) - vfsmount_node = srcu_dereference(vfsmount_node->next, - &fsnotify_mark_srcu); +skip: + if (inode_mark) + iter_info.inode_mark = fsnotify_next_mark(iter_info.inode_mark); + if (vfsmount_mark) + iter_info.vfsmount_mark = fsnotify_next_mark(iter_info.vfsmount_mark); } ret = 0; out: