Commit 3cd5eca8 authored by Al Viro's avatar Al Viro
Browse files

fsnotify: constify 'data' passed to ->handle_event() 



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

fs/notify/dnotify/dnotify.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -85,7 +85,7 @@ static int dnotify_handle_event(struct fsnotify_group *group, 
				struct inode *inode,

				struct inode *inode,

				struct fsnotify_mark *inode_mark,

				struct fsnotify_mark *inode_mark,

				struct fsnotify_mark *vfsmount_mark,

				struct fsnotify_mark *vfsmount_mark,

				u32 mask, void *data, int data_type,

				u32 mask, const void *data, int data_type,

				const unsigned char *file_name, u32 cookie)

				const unsigned char *file_name, u32 cookie)

{

{

	struct dnotify_mark *dn_mark;

	struct dnotify_mark *dn_mark;

fs/notify/fanotify/fanotify.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -90,10 +90,10 @@ static int fanotify_get_response(struct fsnotify_group *group, 
static bool fanotify_should_send_event(struct fsnotify_mark *inode_mark,

static bool fanotify_should_send_event(struct fsnotify_mark *inode_mark,

				       struct fsnotify_mark *vfsmnt_mark,

				       struct fsnotify_mark *vfsmnt_mark,

				       u32 event_mask,

				       u32 event_mask,

				       void *data, int data_type)

				       const void *data, int data_type)

{

{

	__u32 marks_mask, marks_ignored_mask;

	__u32 marks_mask, marks_ignored_mask;

	struct path *path = data;

	const struct path *path = data;





	pr_debug("%s: inode_mark=%p vfsmnt_mark=%p mask=%x data=%p"

	pr_debug("%s: inode_mark=%p vfsmnt_mark=%p mask=%x data=%p"

		 " data_type=%d\n", __func__, inode_mark, vfsmnt_mark,

		 " data_type=%d\n", __func__, inode_mark, vfsmnt_mark,
@@ -140,7 +140,7 @@ static bool fanotify_should_send_event(struct fsnotify_mark *inode_mark, 
}

}





struct fanotify_event_info *fanotify_alloc_event(struct inode *inode, u32 mask,

struct fanotify_event_info *fanotify_alloc_event(struct inode *inode, u32 mask,

						 struct path *path)

						 const struct path *path)

{

{

	struct fanotify_event_info *event;

	struct fanotify_event_info *event;
@@ -177,7 +177,7 @@ static int fanotify_handle_event(struct fsnotify_group *group, 
				 struct inode *inode,

				 struct inode *inode,

				 struct fsnotify_mark *inode_mark,

				 struct fsnotify_mark *inode_mark,

				 struct fsnotify_mark *fanotify_mark,

				 struct fsnotify_mark *fanotify_mark,

				 u32 mask, void *data, int data_type,

				 u32 mask, const void *data, int data_type,

				 const unsigned char *file_name, u32 cookie)

				 const unsigned char *file_name, u32 cookie)

{

{

	int ret = 0;

	int ret = 0;

fs/notify/fanotify/fanotify.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -47,4 +47,4 @@ static inline struct fanotify_event_info *FANOTIFY_E(struct fsnotify_event *fse) 
}

}





struct fanotify_event_info *fanotify_alloc_event(struct inode *inode, u32 mask,

struct fanotify_event_info *fanotify_alloc_event(struct inode *inode, u32 mask,

						 struct path *path);
 
						 const struct path *path);

fs/notify/inotify/inotify.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ extern int inotify_handle_event(struct fsnotify_group *group, 
				struct inode *inode,

				struct inode *inode,

				struct fsnotify_mark *inode_mark,

				struct fsnotify_mark *inode_mark,

				struct fsnotify_mark *vfsmount_mark,

				struct fsnotify_mark *vfsmount_mark,

				u32 mask, void *data, int data_type,

				u32 mask, const void *data, int data_type,

				const unsigned char *file_name, u32 cookie);

				const unsigned char *file_name, u32 cookie);





extern const struct fsnotify_ops inotify_fsnotify_ops;
 
extern const struct fsnotify_ops inotify_fsnotify_ops;

fs/notify/inotify/inotify_fsnotify.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ int inotify_handle_event(struct fsnotify_group *group, 
			 struct inode *inode,

			 struct inode *inode,

			 struct fsnotify_mark *inode_mark,

			 struct fsnotify_mark *inode_mark,

			 struct fsnotify_mark *vfsmount_mark,

			 struct fsnotify_mark *vfsmount_mark,

			 u32 mask, void *data, int data_type,

			 u32 mask, const void *data, int data_type,

			 const unsigned char *file_name, u32 cookie)

			 const unsigned char *file_name, u32 cookie)

{

{

	struct inotify_inode_mark *i_mark;

	struct inotify_inode_mark *i_mark;
@@ -80,7 +80,7 @@ int inotify_handle_event(struct fsnotify_group *group, 




	if ((inode_mark->mask & FS_EXCL_UNLINK) &&

	if ((inode_mark->mask & FS_EXCL_UNLINK) &&

	    (data_type == FSNOTIFY_EVENT_PATH)) {

	    (data_type == FSNOTIFY_EVENT_PATH)) {

		struct path *path = data;

		const struct path *path = data;





		if (d_unlinked(path->dentry))

		if (d_unlinked(path->dentry))

			return 0;

			return 0;