linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Amir Goldstein <amir73il@gmail.com>
To: Jan Kara <jack@suse.cz>
Cc: Josef Bacik <josef@toxicpanda.com>,
	Christian Brauner <brauner@kernel.org>,
	linux-fsdevel@vger.kernel.org
Subject: [PATCH v3 3/6] Revert "xfs: add pre-content fsnotify hook for DAX faults"
Date: Wed, 12 Mar 2025 08:38:49 +0100	[thread overview]
Message-ID: <20250312073852.2123409-4-amir73il@gmail.com> (raw)
In-Reply-To: <20250312073852.2123409-1-amir73il@gmail.com>

This reverts commit 7f4796a46571ced5d3d5b0942e1bfea1eedaaecd.
---
 fs/xfs/xfs_file.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index f7a7d89c345ec..9a435b1ff2647 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -1451,9 +1451,6 @@ xfs_dax_read_fault(
 
 	trace_xfs_read_fault(ip, order);
 
-	ret = filemap_fsnotify_fault(vmf);
-	if (unlikely(ret))
-		return ret;
 	xfs_ilock(ip, XFS_MMAPLOCK_SHARED);
 	ret = xfs_dax_fault_locked(vmf, order, false);
 	xfs_iunlock(ip, XFS_MMAPLOCK_SHARED);
@@ -1482,16 +1479,6 @@ xfs_write_fault(
 	vm_fault_t		ret;
 
 	trace_xfs_write_fault(ip, order);
-	/*
-	 * Usually we get here from ->page_mkwrite callback but in case of DAX
-	 * we will get here also for ordinary write fault. Handle HSM
-	 * notifications for that case.
-	 */
-	if (IS_DAX(inode)) {
-		ret = filemap_fsnotify_fault(vmf);
-		if (unlikely(ret))
-			return ret;
-	}
 
 	sb_start_pagefault(inode->i_sb);
 	file_update_time(vmf->vma->vm_file);
-- 
2.34.1


  parent reply	other threads:[~2025-03-12  7:39 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-12  7:38 [PATCH v3 0/6] Fix for potential deadlock in pre-content event Amir Goldstein
2025-03-12  7:38 ` [PATCH v3 1/6] fsnotify: add pre-content hooks on mmap() Amir Goldstein
2025-03-12  7:38 ` [PATCH v3 2/6] Revert "ext4: add pre-content fsnotify hook for DAX faults" Amir Goldstein
2025-03-12  7:38 ` Amir Goldstein [this message]
2025-03-12  7:38 ` [PATCH v3 4/6] Revert "fsnotify: generate pre-content permission event on page fault" Amir Goldstein
2025-03-12  7:38 ` [PATCH v3 5/6] Revert "mm: don't allow huge faults for files with pre content watches" Amir Goldstein
2025-03-12  7:38 ` [PATCH v3 6/6] Revert "fanotify: disable readahead if we have pre-content watches" Amir Goldstein
2025-03-12 16:56 ` [PATCH v3 0/6] Fix for potential deadlock in pre-content event Jan Kara

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250312073852.2123409-4-amir73il@gmail.com \
    --to=amir73il@gmail.com \
    --cc=brauner@kernel.org \
    --cc=jack@suse.cz \
    --cc=josef@toxicpanda.com \
    --cc=linux-fsdevel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).