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

Commit 22aa425d authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Eric Paris
Browse files

fanotify: create_fd cleanup 



Code cleanup which does the fd creation work seperately from the userspace
metadata creation.  It fits better with the other code.

Signed-off-by: default avatarAndreas Gruenbacher <agruen@suse.de>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent 9bbfc964

fs/notify/fanotify/fanotify_user.c

+6 −11
Original line number Diff line number Diff line
@@ -43,17 +43,14 @@ static struct fsnotify_event *get_one_event(struct fsnotify_group *group, 
	return fsnotify_remove_notify_event(group);

}



static int create_and_fill_fd(struct fsnotify_group *group,

			      struct fanotify_event_metadata *metadata,

			      struct fsnotify_event *event)

static int create_fd(struct fsnotify_group *group, struct fsnotify_event *event)

{

	int client_fd;

	struct dentry *dentry;

	struct vfsmount *mnt;

	struct file *new_file;



	pr_debug("%s: group=%p metadata=%p event=%p\n", __func__, group,

		 metadata, event);

	pr_debug("%s: group=%p event=%p\n", __func__, group, event);



	client_fd = get_unused_fd();

	if (client_fd < 0)
@@ -93,9 +90,7 @@ static int create_and_fill_fd(struct fsnotify_group *group, 
		fd_install(client_fd, new_file);

	}



	metadata->fd = client_fd;



	return 0;

	return client_fd;

}



static ssize_t fill_event_metadata(struct fsnotify_group *group,
@@ -108,9 +103,9 @@ static ssize_t fill_event_metadata(struct fsnotify_group *group, 
	metadata->event_len = FAN_EVENT_METADATA_LEN;

	metadata->vers = FANOTIFY_METADATA_VERSION;

	metadata->mask = fanotify_outgoing_mask(event->mask);

	metadata->fd = create_fd(group, event);



	return create_and_fill_fd(group, metadata, event);



	return metadata->fd;

}



static ssize_t copy_event_to_user(struct fsnotify_group *group,
@@ -123,7 +118,7 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, 
	pr_debug("%s: group=%p event=%p\n", __func__, group, event);



	ret = fill_event_metadata(group, &fanotify_event_metadata, event);

	if (ret)

	if (ret < 0)

		return ret;



	if (copy_to_user(buf, &fanotify_event_metadata, FAN_EVENT_METADATA_LEN))