Commit 116b9731 authored by Amir Goldstein's avatar Amir Goldstein Committed by Jan Kara
Browse files

fsnotify: add empty fsnotify_{unlink,rmdir}() hooks 



We would like to move fsnotify_nameremove() calls from d_delete()
into a higher layer where the hook makes more sense and so we can
consider every d_delete() call site individually.

Start by creating empty hook fsnotify_{unlink,rmdir}() and place
them in the proper VFS call sites.  After all d_delete() call sites
will be converted to use the new hook, the new hook will generate the
delete events and fsnotify_nameremove() hook will be removed.

Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 0b3b094a

fs/namei.c

+2 −0
Original line number Diff line number Diff line
@@ -3883,6 +3883,7 @@ int vfs_rmdir(struct inode *dir, struct dentry *dentry) 
	dentry->d_inode->i_flags |= S_DEAD;

	dont_mount(dentry);

	detach_mounts(dentry);

	fsnotify_rmdir(dir, dentry);



out:

	inode_unlock(dentry->d_inode);
@@ -3999,6 +4000,7 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry, struct inode **delegate 
			if (!error) {

				dont_mount(dentry);

				detach_mounts(dentry);

				fsnotify_unlink(dir, dentry);

			}

		}

	}

include/linux/fsnotify.h

+26 −0
Original line number Diff line number Diff line
@@ -188,6 +188,19 @@ static inline void fsnotify_link(struct inode *dir, struct inode *inode, struct 
	fsnotify(dir, FS_CREATE, inode, FSNOTIFY_EVENT_INODE, &new_dentry->d_name, 0);

}



/*

 * fsnotify_unlink - 'name' was unlinked

 *

 * Caller must make sure that dentry->d_name is stable.

 */

static inline void fsnotify_unlink(struct inode *dir, struct dentry *dentry)

{

	/* Expected to be called before d_delete() */

	WARN_ON_ONCE(d_is_negative(dentry));



	/* TODO: call fsnotify_dirent() */

}



/*

 * fsnotify_mkdir - directory 'name' was created

 */
@@ -198,6 +211,19 @@ static inline void fsnotify_mkdir(struct inode *inode, struct dentry *dentry) 
	fsnotify_dirent(inode, dentry, FS_CREATE | FS_ISDIR);

}



/*

 * fsnotify_rmdir - directory 'name' was removed

 *

 * Caller must make sure that dentry->d_name is stable.

 */

static inline void fsnotify_rmdir(struct inode *dir, struct dentry *dentry)

{

	/* Expected to be called before d_delete() */

	WARN_ON_ONCE(d_is_negative(dentry));



	/* TODO: call fsnotify_dirent() */

}



/*

 * fsnotify_access - file was read

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE