From patchwork Fri Apr 20 23:10:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10353837 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 3666E600CC for ; Fri, 20 Apr 2018 23:10:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E8EC288E0 for ; Fri, 20 Apr 2018 23:10:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12F08288E2; Fri, 20 Apr 2018 23:10:01 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 AE190288CD for ; Fri, 20 Apr 2018 23:10:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752647AbeDTXJ5 (ORCPT ); Fri, 20 Apr 2018 19:09:57 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:46613 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752489AbeDTXJr (ORCPT ); Fri, 20 Apr 2018 19:09:47 -0400 Received: by mail-pf0-f195.google.com with SMTP id h69so4898184pfe.13 for ; Fri, 20 Apr 2018 16:09:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XkAZnd/qTBkvC11uZKOvproKaNncO6tBUZM8iK06KuE=; b=dU1P9zwh584caIwnKg3ulOQmiwt/uhx5uKXtRVssYwEV2GUKT1vjjCiJYFnv5snE8Y mjcuU/ZZyTAxS2uLfBPtzBP1U8iqcBv14l0GCtr/qUA9S9fcS6i19l2P9Q0p6LmSJv85 Ojdcm9GWTPcfKWTlTaxnNaDTOWu8gZqZSpB1no1IVg0oyDeD2TcJCET1eZr07YyY6Kne 9v6k6cRADbjNykEuEkzdYAdWbvLcySAXHLxau06lgR9/DBB5evgs+OuqMLXi3tw8sntd Br+ufRjjEKsvKEIM0HVbcIoA7dawrMaavr0fDd40Nhr/mR7l9eAoSll9QSOYvwE9Gtca CQlg== 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=XkAZnd/qTBkvC11uZKOvproKaNncO6tBUZM8iK06KuE=; b=qSyDlrGwNEIeYIrPaR9gI5NLvSOCgSvNngf+U2E1eVXtrZkzUpyPq+c4U6fr3UDFPe yu62dZsat2copS/I9c0snVYrr1e6Lsp24LQ8Yg7WkpvzY5CG46XMtEza9NWzUxtzfy47 ppEkEzK01Z88372KrLof+8gDwGzWa+4MXDcUzgMnYeRHf6ImVAaSGN3tEOb3IioxFdve rqwZw0Qa9uos+nHff53b/D2IbaW0GbOx1YXXHA7YDO71U1/QbPEJVpKROzLTuUg+h6Ke gnj62+g03Us5jVVwgiHbWiHt/AyxBGuTaPz7CS6lksfghNnoG0ggRT01xmX4DpVfuFFU y96g== X-Gm-Message-State: ALQs6tC6+3sudY0+6FQyOVftDxHNHauGKr2K6k/0JTbp6p+1tv2kED7j pt69JZdyPmgs1Xdv0kBuuzDm6Q== X-Google-Smtp-Source: AIpwx48sCbrh4+yFWHA/CAelkXzoxapy649mO+YqFqNGjhxPj4W3wDPPn5/uH7NOeE6aL8Ml4+DutQ== X-Received: by 10.98.82.131 with SMTP id g125mr11177917pfb.198.1524265787099; Fri, 20 Apr 2018 16:09:47 -0700 (PDT) Received: from amir-VirtualBox.localdomain (c-24-5-85-70.hsd1.ca.comcast.net. [24.5.85.70]) by smtp.gmail.com with ESMTPSA id c12sm10541220pfn.13.2018.04.20.16.09.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Apr 2018 16:09:46 -0700 (PDT) From: Amir Goldstein To: Jan Kara Cc: linux-fsdevel@vger.kernel.org Subject: [PATCH v3 05/13] fsnotify: generalize send_to_group() Date: Fri, 20 Apr 2018 16:10:53 -0700 Message-Id: <1524265861-6316-6-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524265861-6316-1-git-send-email-amir73il@gmail.com> References: <1524265861-6316-1-git-send-email-amir73il@gmail.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 fsnotify_foreach_obj_type macros to generalize the code that filters events by marks mask and ignored_mask. This is going to be used for adding mark of super block object type. Signed-off-by: Amir Goldstein --- fs/notify/fsnotify.c | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c index bc9a51480156..f174397b63a0 100644 --- a/fs/notify/fsnotify.c +++ b/fs/notify/fsnotify.c @@ -189,46 +189,44 @@ static int send_to_group(struct inode *to_tell, const unsigned char *file_name, struct fsnotify_iter_info *iter_info) { - struct fsnotify_mark *inode_mark = fsnotify_iter_inode_mark(iter_info); - struct fsnotify_mark *vfsmount_mark = fsnotify_iter_vfsmount_mark(iter_info); struct fsnotify_group *group = NULL; __u32 test_mask = (mask & ~FS_EVENT_ON_CHILD); __u32 marks_mask = 0; __u32 marks_ignored_mask = 0; + struct fsnotify_mark *mark; + int type; if (WARN_ON(!iter_info->report_mask)) return 0; /* clear ignored on inode modification */ if (mask & FS_MODIFY) { - if (inode_mark && - !(inode_mark->flags & FSNOTIFY_MARK_FLAG_IGNORED_SURV_MODIFY)) - inode_mark->ignored_mask = 0; - if (vfsmount_mark && - !(vfsmount_mark->flags & FSNOTIFY_MARK_FLAG_IGNORED_SURV_MODIFY)) - vfsmount_mark->ignored_mask = 0; - } - - /* does the inode mark tell us to do something? */ - if (inode_mark) { - group = inode_mark->group; - marks_mask |= inode_mark->mask; - marks_ignored_mask |= inode_mark->ignored_mask; + fsnotify_foreach_obj_type(type) { + if (!fsnotify_iter_should_report_type(iter_info, type)) + continue; + mark = iter_info->marks[type]; + if (mark && + !(mark->flags & FSNOTIFY_MARK_FLAG_IGNORED_SURV_MODIFY)) + mark->ignored_mask = 0; + } } - /* does the vfsmount_mark tell us to do something? */ - if (vfsmount_mark) { - group = vfsmount_mark->group; - marks_mask |= vfsmount_mark->mask; - marks_ignored_mask |= vfsmount_mark->ignored_mask; + fsnotify_foreach_obj_type(type) { + if (!fsnotify_iter_should_report_type(iter_info, type)) + continue; + mark = iter_info->marks[type]; + /* does the object mark tell us to do something? */ + if (mark) { + group = mark->group; + marks_mask |= mark->mask; + marks_ignored_mask |= mark->ignored_mask; + } } - pr_debug("%s: group=%p to_tell=%p mask=%x inode_mark=%p" - " vfsmount_mark=%p marks_mask=%x marks_ignored_mask=%x" + pr_debug("%s: group=%p to_tell=%p mask=%x marks_mask=%x marks_ignored_mask=%x" " data=%p data_is=%d cookie=%d\n", - __func__, group, to_tell, mask, inode_mark, vfsmount_mark, - marks_mask, marks_ignored_mask, data, - data_is, cookie); + __func__, group, to_tell, mask, marks_mask, marks_ignored_mask, + data, data_is, cookie); if (!(test_mask & marks_mask & ~marks_ignored_mask)) return 0;