From patchwork Mon May 11 17:58:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 11541391 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 92A87913 for ; Mon, 11 May 2020 17:59:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 826CE20720 for ; Mon, 11 May 2020 17:59:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730979AbgEKR7G (ORCPT ); Mon, 11 May 2020 13:59:06 -0400 Received: from mailrelay107.isp.belgacom.be ([195.238.20.134]:58266 "EHLO mailrelay107.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727051AbgEKR7G (ORCPT ); Mon, 11 May 2020 13:59:06 -0400 IronPort-SDR: WCgrKXePoExsesfAu6YdoHKC9RbY4MKgwj8fC2nDoWaUwsOk17Q9vg4b8F9OfPJdVISiBiO2qQ Cn4Gr6+IWHHE5S6ZQROylHEspsu3bOzsuddDj9sU7QT5woyv1p87bdBDBedB9FDu+okegTgT4S xHeIwqCILZpAbsgKtOVgb5ou8Wwxy+EbMYdoM6vmXbDGdGAAKsk9Tsnf67Vqd3Al80AUXKqygy LQnTMZ3ct9xibLcdOAY5/wShZEjQ0QGXqLUanF3iOrG7o/2eM6LUngx4+KBhPg3j7SAGsYvDc8 gEc= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:Qdu0sBayuqsHqjPNTIGL/hr/LSx+4OfEezUN459isYplN5qZrsiybnLW6fgltlLVR4KTs6sC17OL9fG4EjVZu96oizMrSNR0TRgLiMEbzUQLIfWuLgnFFsPsdDEwB89YVVVorDmROElRH9viNRWJ+iXhpTEdFQ/iOgVrO+/7BpDdj9it1+C15pbffxhEiCCybL9vLBi6twHcutUZjYd/N6o91AbCr2dVdehR2W5mP0+YkQzm5se38p5j8iBQtOwk+sVdT6j0fLk2QKJBAjg+PG87+MPktR/YTQuS/XQcSXkZkgBJAwfe8h73WIr6vzbguep83CmaOtD2TawxVD+/4apnVAPkhSEaPDM/7WrZiNF/jLhDrRyhuRJx3oDaboKSOvVxca3QZs8WSGlbU8pNTSFNHp+wYo0SBOQBJ+ZYqIz9qkMOoxSkHgasBfngyjlVjXH2x601zfkuHh/c3AwhA90Os2nfodL7NKgISu+1wrLFzS7Ab/JW3zfy9pTIfgo6rv6SRL99d9faxkYzGQ3flFqQtZDlMC2P1uQLq2WV4eltWOavhWMmqwx9vDaiyMcxh4XVm44Z1lHJ+yp2zosoK9C1VlN2bN6mHZZOuC+WK4V4TMwmTm9ouCg21LkLtJimdyYJ0JQq3xrSZ+Gdf4SV4R/vSvydLSp5iX9lYr6zmhe//E69wePmTMa0ykxFri9dn9nJsXACygLc59CcSvt44kehwTGP1x3P6u1cIUA7i67bK5k5z7Erl5oTvkvDHjLtmEXti6+Wclgk+vOy5+TnZbXmo4GTO5d1igH4LKsuhtSyDOAlPgQUQmSW+vqw2Kf+8UD4QLhGlOA6n6jBvJDfP8sbp6q5AwFP0oYk7hayFzmm384DknkJN19FYxGHjojvO17QPPD0F+ywjEq0nDdx2//GJqHhAonKLnXbkrfuZ6py601HxQoo0NBf/IxbBqsdL/PyQkXxrsDXDgclMwyoxObqEM9y1oYfWWKVAKKUPqLSsVuT6+IgJumDfo4VuDLnJ/c54P7uiGczmUUBcqmxwZsXdHe4E+xiI0WYZ3rsn9gAHX4EvgolUePllkOCXiBXZ3upQaI86S80CJi8AYfAWI+tmrqB0zm/HpFMYWBGEF+MG2/yd4qYQ/cMdD6SIsh5nzwKT7euUIEh2Aq1tA/5y7tnKPTb+jECuZ34ytcmr9HUwBM7/j9cFNmG3ieGXSU8l2YJXWBt3aRXrkl0y1PF2q990NJCEtkGyfpDUw48fbDGwuB3EdH5WUqVcN6DRn69QcSgDC13RN9nkIxGWFp0B9j31kOL5CGtGbJAz7E= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2BMBwACkrle/xCltltmhE0tgWQSLI0lhXqMGJFYCwEBAQEBAQEBATQBAgQBAYREgg0nOBMCAwEBAQMCBQEBBgEBAQEBAQQEAWwEAQEHCgIBhE4hAQMBAQUKAQsIMII7IoNCCwEjI09wEoJbS4JYKbBBM4VRg1aBQIE4h12FAYFBP4RfikIEmBCaW4JUgnGVKwwdnTotj3CfOyKBVk0gGDuCaVAYDYlElUZCMDcCBggBAQMJVwEiAY4IAQE X-IPAS-Result: A2BMBwACkrle/xCltltmhE0tgWQSLI0lhXqMGJFYCwEBAQEBAQEBATQBAgQBAYREgg0nOBMCAwEBAQMCBQEBBgEBAQEBAQQEAWwEAQEHCgIBhE4hAQMBAQUKAQsIMII7IoNCCwEjI09wEoJbS4JYKbBBM4VRg1aBQIE4h12FAYFBP4RfikIEmBCaW4JUgnGVKwwdnTotj3CfOyKBVk0gGDuCaVAYDYlElUZCMDcCBggBAQMJVwEiAY4IAQE Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO biggussolus.home) ([91.182.165.16]) by relay.skynet.be with ESMTP; 11 May 2020 19:59:04 +0200 From: Fabian Frederick To: jack@suse.cz, amir73il@gmail.com Cc: linux-fsdevel@vger.kernel.org, Fabian Frederick Subject: [PATCH 1/9 linux-next] fanotify: prefix should_merge() Date: Mon, 11 May 2020 19:58:58 +0200 Message-Id: <20200511175858.214835-1-fabf@skynet.be> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org prefix function with fanotify_ like others Signed-off-by: Fabian Frederick --- fs/notify/fanotify/fanotify.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c index 5435a40f82be..95480d3dcff7 100644 --- a/fs/notify/fanotify/fanotify.c +++ b/fs/notify/fanotify/fanotify.c @@ -70,7 +70,7 @@ static bool fanotify_name_event_equal(struct fanotify_name_event *fne1, return !memcmp(fne1->name, fne2->name, fne1->name_len); } -static bool should_merge(struct fsnotify_event *old_fsn, +static bool fanotify_should_merge(struct fsnotify_event *old_fsn, struct fsnotify_event *new_fsn) { struct fanotify_event *old, *new; @@ -129,7 +129,7 @@ static int fanotify_merge(struct list_head *list, struct fsnotify_event *event) return 0; list_for_each_entry_reverse(test_event, list, list) { - if (should_merge(test_event, event)) { + if (fanotify_should_merge(test_event, event)) { FANOTIFY_E(test_event)->mask |= new->mask; return 1; }