evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fanotify: create_fd cleanup

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

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Eric Paris <eparis@redhat.com>
This commit is contained in:
Andreas Gruenbacher 2009-12-17 21:24:26 -05:00 • committed by Eric Paris
parent 9bbfc964b8
commit 22aa425dec
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
fs/notify/fanotify/fanotify_user.c
View file

@ -43,17 +43,14 @@ static struct fsnotify_event *get_one_event(struct fsnotify_group *group,
return fsnotify_remove_notify_event(group); return fsnotify_remove_notify_event(group);
} }
static int create_and_fill_fd(struct fsnotify_group *group, static int create_fd(struct fsnotify_group *group, struct fsnotify_event *event)
struct fanotify_event_metadata *metadata,
struct fsnotify_event *event)
{ {
int client_fd; int client_fd;
struct dentry *dentry; struct dentry *dentry;
struct vfsmount *mnt; struct vfsmount *mnt;
struct file *new_file; struct file *new_file;
pr_debug("%s: group=%p metadata=%p event=%p\n", __func__, group, pr_debug("%s: group=%p event=%p\n", __func__, group, event);
metadata, event);
client_fd = get_unused_fd(); client_fd = get_unused_fd();
if (client_fd < 0) if (client_fd < 0)
@ -93,9 +90,7 @@ static int create_and_fill_fd(struct fsnotify_group *group,
fd_install(client_fd, new_file); fd_install(client_fd, new_file);
} }
metadata->fd = client_fd; return client_fd;
return 0;
} }
static ssize_t fill_event_metadata(struct fsnotify_group *group, 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->event_len = FAN_EVENT_METADATA_LEN;
metadata->vers = FANOTIFY_METADATA_VERSION; metadata->vers = FANOTIFY_METADATA_VERSION;
metadata->mask = fanotify_outgoing_mask(event->mask); 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, 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); pr_debug("%s: group=%p event=%p\n", __func__, group, event);
ret = fill_event_metadata(group, &fanotify_event_metadata, event); ret = fill_event_metadata(group, &fanotify_event_metadata, event);
if (ret) if (ret < 0)
return ret; return ret;
if (copy_to_user(buf, &fanotify_event_metadata, FAN_EVENT_METADATA_LEN)) if (copy_to_user(buf, &fanotify_event_metadata, FAN_EVENT_METADATA_LEN))