From patchwork Tue May 12 18:17:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 11543727 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 E322E92A for ; Tue, 12 May 2020 18:17:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D43F62080D for ; Tue, 12 May 2020 18:17:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730935AbgELSRX (ORCPT ); Tue, 12 May 2020 14:17:23 -0400 Received: from mailrelay115.isp.belgacom.be ([195.238.20.142]:26516 "EHLO mailrelay115.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730934AbgELSRW (ORCPT ); Tue, 12 May 2020 14:17:22 -0400 IronPort-SDR: XLHJZvM85Y/wWWMS7jaUJTRfDk22UeI837iQWRFiJcqOKMtbLpNxeYLeWrBcfgDNaiu1oQ9zt9 24URL+D94do0dp09BFLY4GStmlcolJeIHjAeGD1hmax34ywUH5J4X5MFYo25vpBBVmdYcMiyxH DqA8HW85HIFMaVmbo+FNj7C334Dtf0s/uZadXVYpczgxm3V6mnPCGVBWHtNOYqiYgUMfLQNLCf xNuV5+JU0hxmRg1XLQRPzC4oYUBHjLyNONfkl5gsg0C6cNpLyJ/Kbo0u66pPtm7+tPp3Owj32I 4UE= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:YD34xhc0ze1hIeaccVIMT+EBlGMj4u6mDksu8pMizoh2WeGdxcW+bB7h7PlgxGXEQZ/co6odzbaP7uaxAydZuMbJmUtBWaQEbwUCh8QSkl5oK+++Imq/EsTXaTcnFt9JTl5v8iLzG0FUHMHjew+a+SXqvnYdFRrlKAV6OPn+FJLMgMSrzeCy/IDYbxlViDanbr5+MRW7oR/Vu8UIjoduN7s9xxjUqXZUZupawn9lK0iOlBjm/Mew+5Bj8yVUu/0/8sNLTLv3caclQ7FGFToqK2866tHluhnFVguP+2ATUn4KnRpSAgjK9w/1U5HsuSbnrOV92S2aPcrrTbAoXDmp8qlmRAP0hCoBKjU09nzchM5tg6JBuB+vpwJxzZPabo+WM/RxcazTcMgGSWdCRMtdSzZMDp+gY4YJEuEPPfxYr474p1YWrRWxHxKjBOL1xT9Om3T43bc63Po8Hg7YxgwgHs4BsHfJp9jyOqcdS/u6zKfTwDXYbPNX2TH955bUchw7uv6DQ6t9fMzMwkYgCw3LlE+fqZD5PzyLzOQNtXCW4eRjWO+ri2AqqgF8riahy8ksl4TFmp8ZxkzF+Ct2z4g4ONO1RVBmbNOkEpZdqS6UO5d4TM0tR2xmuCY0xqMCtJO9YSMEy4wnygbbZvCaaYSE/xHuWPiLLTtlhX9oeKiziwuz/EWm1+byTNO70ExQoSpAitTMs3cN2AHN5cWfUft9+1uh2S6I1wDO9uFIOUA0mrTfK54m2rM/jZsTsUvMHi/rg0X2l6iWdkE5+uiz8ejnYrLmppqCOINsiwH+NLohmtCnDOk8LwQCRXWX9Oei2LH54EH0QbVHgucrnqTYqJzaIN4Upq+9Aw9byIYj7BO/Ai+o0NsChnYHIklIeAmEj4npPVHBPuz4Ae2kjFuyiDtr3ezJPqX9ApXRKXjOiLXhcqxh5E5f0wcz1s1f54lKBb0bPP3yW1f7tMbEAR8hLwy03+HnBc1n2YMbWGKPGK2UPa3TsV+M/e8vLOyMa5UUuDb5MfQq+/nujXohk18HYaapxYcXaGy/Hvl+J0WZYHzsgsoOEGsTsAo+V/Hlh0OcUTFNY3a/RLw85j4lB4K8F4vDRZ6igKaH3CilGp1afGdGCkqDEX3wbYWLR+8MaD6OIs9mijEEW6KuRJQv1Ry1rw/6yLpmLuzK9S0Er57sz8Z6tKXvkkQw/Dd3J9+AyGzLRHMw1moNRiVph6F7iUN4w1aHl6N/hq92D9tWst1AWAYzM9by1eF2BsrzUQGJKtmAQliOWda3BzwtCNg8lYxdK31hEsmv20iQlxGhBKUYwuSG X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2BnFQAE57pe/xCltltmglKBey2BZBIsjSWFfIwYj16BegsBAQEBAQEBAQE0AQIEAQGERIIEJzoEDQIDAQEBAwIFAQEGAQEBAQEBBAQBbAQBAQcKAgGETiEBAwEBBQoBCwgwgjsig0ILASMjT3ASgltLglgpsT0zhVGDV4FAgTiHXYUBgUE/hF+KQgSYEJpbglSCcZUrDB2dOi2PcJ8+BhmBVk0gGDuCaVAYDYlElUZCMDcCBggBAQMJVwEiAY4IAQE X-IPAS-Result: A2BnFQAE57pe/xCltltmglKBey2BZBIsjSWFfIwYj16BegsBAQEBAQEBAQE0AQIEAQGERIIEJzoEDQIDAQEBAwIFAQEGAQEBAQEBBAQBbAQBAQcKAgGETiEBAwEBBQoBCwgwgjsig0ILASMjT3ASgltLglgpsT0zhVGDV4FAgTiHXYUBgUE/hF+KQgSYEJpbglSCcZUrDB2dOi2PcJ8+BhmBVk0gGDuCaVAYDYlElUZCMDcCBggBAQMJVwEiAY4IAQE Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO biggussolus.home) ([91.182.165.16]) by relay.skynet.be with ESMTP; 12 May 2020 20:17:20 +0200 From: Fabian Frederick To: jack@suse.cz, amir73il@gmail.com Cc: linux-fsdevel@vger.kernel.org, Fabian Frederick Subject: [PATCH V2 1/6 linux-next] fanotify: prefix should_merge() Date: Tue, 12 May 2020 20:17:15 +0200 Message-Id: <20200512181715.405728-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; }