Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 573e1784 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

Revert "fsnotify: support overlayfs" 



This reverts commit f3fbbb07.

Overlayfs now works correctly without adding hacks to fsnotify.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent de2a4a50

include/linux/fsnotify.h

+5 −9
Original line number Diff line number Diff line
@@ -30,11 +30,7 @@ static inline int fsnotify_parent(const struct path *path, struct dentry *dentry 
static inline int fsnotify_perm(struct file *file, int mask)

{

	const struct path *path = &file->f_path;

	/*

	 * Do not use file_inode() here or anywhere in this file to get the

	 * inode.  That would break *notity on overlayfs.

	 */

	struct inode *inode = path->dentry->d_inode;

	struct inode *inode = file_inode(file);

	__u32 fsnotify_mask = 0;

	int ret;
@@ -178,7 +174,7 @@ static inline void fsnotify_mkdir(struct inode *inode, struct dentry *dentry) 
static inline void fsnotify_access(struct file *file)

{

	const struct path *path = &file->f_path;

	struct inode *inode = path->dentry->d_inode;

	struct inode *inode = file_inode(file);

	__u32 mask = FS_ACCESS;



	if (S_ISDIR(inode->i_mode))
@@ -196,7 +192,7 @@ static inline void fsnotify_access(struct file *file) 
static inline void fsnotify_modify(struct file *file)

{

	const struct path *path = &file->f_path;

	struct inode *inode = path->dentry->d_inode;

	struct inode *inode = file_inode(file);

	__u32 mask = FS_MODIFY;



	if (S_ISDIR(inode->i_mode))
@@ -214,7 +210,7 @@ static inline void fsnotify_modify(struct file *file) 
static inline void fsnotify_open(struct file *file)

{

	const struct path *path = &file->f_path;

	struct inode *inode = path->dentry->d_inode;

	struct inode *inode = file_inode(file);

	__u32 mask = FS_OPEN;



	if (S_ISDIR(inode->i_mode))
@@ -230,7 +226,7 @@ static inline void fsnotify_open(struct file *file) 
static inline void fsnotify_close(struct file *file)

{

	const struct path *path = &file->f_path;

	struct inode *inode = path->dentry->d_inode;

	struct inode *inode = file_inode(file);

	fmode_t mode = file->f_mode;

	__u32 mask = (mode & FMODE_WRITE) ? FS_CLOSE_WRITE : FS_CLOSE_NOWRITE;