Commit e43e9c33 authored by Al Viro's avatar Al Viro
Browse files

fsnotify: switch send_to_group() and ->handle_event to const struct qstr * 



note that conditions surrounding accesses to dname in audit_watch_handle_event()
and audit_mark_handle_event() guarantee that dname won't have been NULL.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 25b229df

fs/notify/dnotify/dnotify.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void dnotify_recalc_inode_mask(struct fsnotify_mark *fsn_mark) 
static int dnotify_handle_event(struct fsnotify_group *group,

				struct inode *inode,

				u32 mask, const void *data, int data_type,

				const unsigned char *file_name, u32 cookie,

				const struct qstr *file_name, u32 cookie,

				struct fsnotify_iter_info *iter_info)

{

	struct fsnotify_mark *inode_mark = fsnotify_iter_inode_mark(iter_info);

fs/notify/fanotify/fanotify.c

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static __kernel_fsid_t fanotify_get_fsid(struct fsnotify_iter_info *iter_info) 
static int fanotify_handle_event(struct fsnotify_group *group,

				 struct inode *inode,

				 u32 mask, const void *data, int data_type,

				 const unsigned char *file_name, u32 cookie,

				 const struct qstr *file_name, u32 cookie,

				 struct fsnotify_iter_info *iter_info)

{

	int ret = 0;

fs/notify/fsnotify.c

+2 −2
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ EXPORT_SYMBOL_GPL(__fsnotify_parent); 
static int send_to_group(struct inode *to_tell,

			 __u32 mask, const void *data,

			 int data_is, u32 cookie,

			 const unsigned char *file_name,

			 const struct qstr *file_name,

			 struct fsnotify_iter_info *iter_info)

{

	struct fsnotify_group *group = NULL;
@@ -379,7 +379,7 @@ int fsnotify(struct inode *to_tell, __u32 mask, const void *data, int data_is, 
	 */

	while (fsnotify_iter_select_report_types(&iter_info)) {

		ret = send_to_group(to_tell, mask, data, data_is, cookie,

				    file_name->name, &iter_info);

				    file_name, &iter_info);



		if (ret && (mask & ALL_FSNOTIFY_PERM_EVENTS))

			goto out;

fs/notify/inotify/inotify.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ extern void inotify_ignored_and_remove_idr(struct fsnotify_mark *fsn_mark, 
extern int inotify_handle_event(struct fsnotify_group *group,

				struct inode *inode,

				u32 mask, const void *data, int data_type,

				const unsigned char *file_name, u32 cookie,

				const struct qstr *file_name, u32 cookie,

				struct fsnotify_iter_info *iter_info);



extern const struct fsnotify_ops inotify_fsnotify_ops;

fs/notify/inotify/inotify_fsnotify.c

+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int inotify_merge(struct list_head *list, 
int inotify_handle_event(struct fsnotify_group *group,

			 struct inode *inode,

			 u32 mask, const void *data, int data_type,

			 const unsigned char *file_name, u32 cookie,

			 const struct qstr *file_name, u32 cookie,

			 struct fsnotify_iter_info *iter_info)

{

	struct fsnotify_mark *inode_mark = fsnotify_iter_inode_mark(iter_info);
@@ -89,7 +89,7 @@ int inotify_handle_event(struct fsnotify_group *group, 
			return 0;

	}

	if (file_name) {

		len = strlen(file_name);

		len = strlen(file_name->name);

		alloc_len += len + 1;

	}
@@ -129,7 +129,7 @@ int inotify_handle_event(struct fsnotify_group *group, 
	event->sync_cookie = cookie;

	event->name_len = len;

	if (len)

		strcpy(event->name, file_name);

		strcpy(event->name, file_name->name);



	ret = fsnotify_add_event(group, fsn_event, inotify_merge);

	if (ret) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE