Commit 9daa8110 authored by Gabriel Krisman Bertazi's avatar Gabriel Krisman Bertazi Committed by Jan Kara
Browse files

fsnotify: Support FS_ERROR event type 

Expose a new type of fsnotify event for filesystems to report errors for
userspace monitoring tools.  fanotify will send this type of
notification for FAN_FS_ERROR events.  This also introduce a helper for
generating the new event.

Link: https://lore.kernel.org/r/20211025192746.66445-18-krisman@collabora.com


Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarGabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 4fe595cf

include/linux/fsnotify.h

+13 −0
Original line number Diff line number Diff line
@@ -339,4 +339,17 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid) 
		fsnotify_dentry(dentry, mask);

}



static inline int fsnotify_sb_error(struct super_block *sb, struct inode *inode,

				    int error)

{

	struct fs_error_report report = {

		.error = error,

		.inode = inode,

		.sb = sb,

	};



	return fsnotify(FS_ERROR, &report, FSNOTIFY_EVENT_ERROR,

			NULL, NULL, NULL, 0);

}



#endif	/* _LINUX_FS_NOTIFY_H */

include/linux/fsnotify_backend.h

+31 −1
Original line number Diff line number Diff line
@@ -42,6 +42,12 @@ 


#define FS_UNMOUNT		0x00002000	/* inode on umount fs */

#define FS_Q_OVERFLOW		0x00004000	/* Event queued overflowed */

#define FS_ERROR		0x00008000	/* Filesystem Error (fanotify) */



/*

 * FS_IN_IGNORED overloads FS_ERROR.  It is only used internally by inotify

 * which does not support FS_ERROR.

 */

#define FS_IN_IGNORED		0x00008000	/* last inotify event here */



#define FS_OPEN_PERM		0x00010000	/* open event in an permission hook */
@@ -95,7 +101,8 @@ 
#define ALL_FSNOTIFY_EVENTS (ALL_FSNOTIFY_DIRENT_EVENTS | \

			     FS_EVENTS_POSS_ON_CHILD | \

			     FS_DELETE_SELF | FS_MOVE_SELF | FS_DN_RENAME | \

			     FS_UNMOUNT | FS_Q_OVERFLOW | FS_IN_IGNORED)

			     FS_UNMOUNT | FS_Q_OVERFLOW | FS_IN_IGNORED | \

			     FS_ERROR)



/* Extra flags that may be reported with event or control handling of events */

#define ALL_FSNOTIFY_FLAGS  (FS_EXCL_UNLINK | FS_ISDIR | FS_IN_ONESHOT | \
@@ -250,6 +257,13 @@ enum fsnotify_data_type { 
	FSNOTIFY_EVENT_PATH,

	FSNOTIFY_EVENT_INODE,

	FSNOTIFY_EVENT_DENTRY,

	FSNOTIFY_EVENT_ERROR,

};



struct fs_error_report {

	int error;

	struct inode *inode;

	struct super_block *sb;

};



static inline struct inode *fsnotify_data_inode(const void *data, int data_type)
@@ -261,6 +275,8 @@ static inline struct inode *fsnotify_data_inode(const void *data, int data_type) 
		return d_inode(data);

	case FSNOTIFY_EVENT_PATH:

		return d_inode(((const struct path *)data)->dentry);

	case FSNOTIFY_EVENT_ERROR:

		return ((struct fs_error_report *)data)->inode;

	default:

		return NULL;

	}
@@ -300,6 +316,20 @@ static inline struct super_block *fsnotify_data_sb(const void *data, 
		return ((struct dentry *)data)->d_sb;

	case FSNOTIFY_EVENT_PATH:

		return ((const struct path *)data)->dentry->d_sb;

	case FSNOTIFY_EVENT_ERROR:

		return ((struct fs_error_report *) data)->sb;

	default:

		return NULL;

	}

}



static inline struct fs_error_report *fsnotify_data_error_report(

							const void *data,

							int data_type)

{

	switch (data_type) {

	case FSNOTIFY_EVENT_ERROR:

		return (struct fs_error_report *) data;

	default:

		return NULL;

	}