Commit 4897e722 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fsnotify_for_v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Pull fsnotify fixes from Jan Kara:
 "Fixes for userspace breakage caused by fsnotify changes ~3 years ago
  and one fanotify cleanup"

* tag 'fsnotify_for_v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  fsnotify: fix fsnotify hooks in pseudo filesystems
  fsnotify: invalidate dcache before IN_DELETE event
  fanotify: remove variable set but not used
parents c2b19fd7 29044dae

fs/btrfs/ioctl.c

+2 −4
Original line number Diff line number Diff line
@@ -3152,10 +3152,8 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file, 
	btrfs_inode_lock(inode, 0);

	err = btrfs_delete_subvolume(dir, dentry);

	btrfs_inode_unlock(inode, 0);

	if (!err) {

		fsnotify_rmdir(dir, dentry);

		d_delete(dentry);

	}

	if (!err)

		d_delete_notify(dir, dentry);



out_dput:

	dput(dentry);

fs/configfs/dir.c

+3 −3
Original line number Diff line number Diff line
@@ -1780,8 +1780,8 @@ void configfs_unregister_group(struct config_group *group) 
	configfs_detach_group(&group->cg_item);

	d_inode(dentry)->i_flags |= S_DEAD;

	dont_mount(dentry);

	d_drop(dentry);

	fsnotify_rmdir(d_inode(parent), dentry);

	d_delete(dentry);

	inode_unlock(d_inode(parent));



	dput(dentry);
@@ -1922,10 +1922,10 @@ void configfs_unregister_subsystem(struct configfs_subsystem *subsys) 
	configfs_detach_group(&group->cg_item);

	d_inode(dentry)->i_flags |= S_DEAD;

	dont_mount(dentry);

	fsnotify_rmdir(d_inode(root), dentry);

	inode_unlock(d_inode(dentry));



	d_delete(dentry);

	d_drop(dentry);

	fsnotify_rmdir(d_inode(root), dentry);



	inode_unlock(d_inode(root));

fs/devpts/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -621,8 +621,8 @@ void devpts_pty_kill(struct dentry *dentry) 


	dentry->d_fsdata = NULL;

	drop_nlink(dentry->d_inode);

	fsnotify_unlink(d_inode(dentry->d_parent), dentry);

	d_drop(dentry);

	fsnotify_unlink(d_inode(dentry->d_parent), dentry);

	dput(dentry);	/* d_alloc_name() in devpts_pty_new() */

}

fs/namei.c

+5 −5
Original line number Diff line number Diff line
@@ -4024,13 +4024,12 @@ int vfs_rmdir(struct user_namespace *mnt_userns, struct inode *dir, 
	dentry->d_inode->i_flags |= S_DEAD;

	dont_mount(dentry);

	detach_mounts(dentry);

	fsnotify_rmdir(dir, dentry);



out:

	inode_unlock(dentry->d_inode);

	dput(dentry);

	if (!error)

		d_delete(dentry);

		d_delete_notify(dir, dentry);

	return error;

}

EXPORT_SYMBOL(vfs_rmdir);
@@ -4152,7 +4151,6 @@ int vfs_unlink(struct user_namespace *mnt_userns, struct inode *dir, 
			if (!error) {

				dont_mount(dentry);

				detach_mounts(dentry);

				fsnotify_unlink(dir, dentry);

			}

		}

	}
@@ -4160,9 +4158,11 @@ int vfs_unlink(struct user_namespace *mnt_userns, struct inode *dir, 
	inode_unlock(target);



	/* We don't d_delete() NFS sillyrenamed files--they still exist. */

	if (!error && !(dentry->d_flags & DCACHE_NFSFS_RENAMED)) {

	if (!error && dentry->d_flags & DCACHE_NFSFS_RENAMED) {

		fsnotify_unlink(dir, dentry);

	} else if (!error) {

		fsnotify_link_count(target);

		d_delete(dentry);

		d_delete_notify(dir, dentry);

	}



	return error;

fs/nfsd/nfsctl.c

+3 −2
Original line number Diff line number Diff line
@@ -1247,7 +1247,8 @@ static void nfsdfs_remove_file(struct inode *dir, struct dentry *dentry) 
	clear_ncl(d_inode(dentry));

	dget(dentry);

	ret = simple_unlink(dir, dentry);

	d_delete(dentry);

	d_drop(dentry);

	fsnotify_unlink(dir, dentry);

	dput(dentry);

	WARN_ON_ONCE(ret);

}
@@ -1338,8 +1339,8 @@ void nfsd_client_rmdir(struct dentry *dentry) 
	dget(dentry);

	ret = simple_rmdir(dir, dentry);

	WARN_ON_ONCE(ret);

	d_drop(dentry);

	fsnotify_rmdir(dir, dentry);

	d_delete(dentry);

	dput(dentry);

	inode_unlock(dir);

}