From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61489C43444 for ; Thu, 10 Jan 2019 17:05:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2D71A20685 for ; Thu, 10 Jan 2019 17:05:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="U/R6ffdp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729264AbfAJRFN (ORCPT ); Thu, 10 Jan 2019 12:05:13 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:41933 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728959AbfAJRFM (ORCPT ); Thu, 10 Jan 2019 12:05:12 -0500 Received: by mail-wr1-f67.google.com with SMTP id x10so12200059wrs.8 for ; Thu, 10 Jan 2019 09:05:11 -0800 (PST) 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=6cN3su4u2jUfsZmXaU4xp7LlS77GvUXPiVgggO9Rp/Y=; b=U/R6ffdpUdWQwy3Gv7pcxVX6ymqZtXlRNUx5fOqb5xPAm/eKcTptZsHuu3VwroAKqY XvAtroEaM3GltroSaB05ABJtw8RFG5cMX7hb89yBT6Yv0pTQU4BVbtF2ZhQsuxIpGhxv Il3smXdXQr5yLCEkz9pz1BLczV5MaUfTey9ztTPnITNIOnb2LYBDAVINVPJnu+1L0DRM 2Y5w4F4KysHLYoE/EJsoCKQQfVSi9dJ2pRfYCnGl2trO82brJmsL5R6Hj9E20LwbXeEZ j3qkNJwUTh3dR8YXLNcyx7zTn2qrDk7EgqZxNRCGNvruypidjsg+mXiHMKPOq+8rOzVY tAAA== 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=6cN3su4u2jUfsZmXaU4xp7LlS77GvUXPiVgggO9Rp/Y=; b=UkBkqBMnF3ZjlnB+F8Bg9wtUfplZXTw5h1xEQOdZTT2pPXGh3uKBOGNmtc1kZ91ZOB d2TIV7QdBcYsICFq4fT0ZC2HEKK9xqXf72RoAc+cXYHPZjGJGuQjlcFpCvdDuKD/WqM+ ldMRzfr/a4LumSWrafpzWFGFJFrdQ2E48PZkFI4D/hrZEuabRdZl/lorZvsCbL4HEXk+ 01uMuCxwL+FhHaAdayyM61ry0UdhTrvKsPV3ajeK6MTyQrejw8uYcq9pujnDrI4N9rqm K2PcEls3+OqCeYu2n4s/LniWHGYvX0NfmiyyB0DAv8tbyrzk7dFolfNWiKj92e9QHqIP DHrw== X-Gm-Message-State: AJcUukddhZEZCgnMBfzwlUIBTJyKhgRw8hM0gbM8IVfk3Af/x7zGu5Mo u6HQUND7tNqAiOGNZvXRHRg= X-Google-Smtp-Source: ALg8bN6u4Yq35TiKAHfPyC440gsD3yONEHB0LOWxeO5c8Krv2LlyFlIu1mJy1Rv/6Lf694NANSLUMw== X-Received: by 2002:adf:fdc2:: with SMTP id i2mr10430239wrs.117.1547139911237; Thu, 10 Jan 2019 09:05:11 -0800 (PST) Received: from amir-VirtualBox.ctera.local ([188.120.129.201]) by smtp.gmail.com with ESMTPSA id m4sm5725868wmi.3.2019.01.10.09.05.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 09:05:10 -0800 (PST) From: Amir Goldstein To: Jan Kara Cc: Matthew Bobrowski , linux-fsdevel@vger.kernel.org Subject: [PATCH v5 14/17] fanotify: check FS_ISDIR flag instead of d_is_dir() Date: Thu, 10 Jan 2019 19:04:41 +0200 Message-Id: <20190110170444.30616-15-amir73il@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190110170444.30616-1-amir73il@gmail.com> References: <20190110170444.30616-1-amir73il@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org All fsnotify hooks set the FS_ISDIR flag for events that happen on directory victim inodes except for fsnotify_perm(). Add the missing FS_ISDIR flag in fsnotify_perm() hook and let fanotify_group_event_mask() check the FS_ISDIR flag instead of checking if path argument is a directory. This is needed for fanotify support for event types that do not carry path information. Signed-off-by: Amir Goldstein --- fs/notify/fanotify/fanotify.c | 2 +- include/linux/fsnotify.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c index 1bbf8b90dd83..fcb98ea99508 100644 --- a/fs/notify/fanotify/fanotify.c +++ b/fs/notify/fanotify/fanotify.c @@ -144,7 +144,7 @@ static u32 fanotify_group_event_mask(struct fsnotify_iter_info *iter_info, marks_ignored_mask |= mark->ignored_mask; } - if (d_is_dir(path->dentry) && + if (event_mask & FS_ISDIR && !(marks_mask & FS_ISDIR & ~marks_ignored_mask)) return 0; diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h index bec2e8f66012..80b782d399bd 100644 --- a/include/linux/fsnotify.h +++ b/include/linux/fsnotify.h @@ -79,6 +79,9 @@ static inline int fsnotify_perm(struct file *file, int mask) fsnotify_mask = FS_ACCESS_PERM; } + if (S_ISDIR(inode->i_mode)) + fsnotify_mask |= FS_ISDIR; + return fsnotify_path(inode, path, fsnotify_mask); } -- 2.17.1