leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fanotify: Drop fanotify_event_has_fid()

Browse Source 
When some events have directory id and some object id,
fanotify_event_has_fid() becomes mostly useless and confusing because we
usually need to know which type of file handle the event has. So just
drop the function and use fanotify_event_object_fh() instead.

Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Jan Kara 2020-03-24 19:35:07 +01:00
parent d766b55361
commit 01affd5471
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/notify/fanotify/fanotify.c
View File

@ -387,7 +387,7 @@ init: __maybe_unused
else
event->pid = get_pid(task_tgid(current));
if (fanotify_event_has_fid(event)) {
if (fanotify_event_object_fh(event)) {
ffe->object_fh.len = 0;
if (fsid)
ffe->fsid = *fsid;

5
fs/notify/fanotify/fanotify.h
View File

@ -83,11 +83,6 @@ FANOTIFY_FE(struct fanotify_event *event)
return container_of(event, struct fanotify_fid_event, fae);
}
static inline bool fanotify_event_has_fid(struct fanotify_event *event)
{
return event->type == FANOTIFY_EVENT_TYPE_FID;
}
static inline __kernel_fsid_t *fanotify_event_fsid(struct fanotify_event *event)
{
if (event->type == FANOTIFY_EVENT_TYPE_FID)

4
fs/notify/fanotify/fanotify_user.c
View File

@ -275,7 +275,7 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
metadata.mask = event->mask & FANOTIFY_OUTGOING_EVENTS;
metadata.pid = pid_vnr(event->pid);
if (fanotify_event_has_fid(event)) {
if (fanotify_event_object_fh(event)) {
metadata.event_len += fanotify_event_info_len(event);
} else if (path && path->mnt && path->dentry) {
fd = create_fd(group, path, &f);
@ -300,7 +300,7 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
if (f) {
fd_install(fd, f);
} else if (fanotify_event_has_fid(event)) {
} else if (fanotify_event_object_fh(event)) {
ret = copy_fid_to_user(fanotify_event_fsid(event),
fanotify_event_object_fh(event),
buf + FAN_EVENT_METADATA_LEN);