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

Commit 33d3dfff authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Eric Paris
Browse files

fanotify: remove outgoing function checks in fanotify.h 



A number of validity checks on outgoing data are done in static inlines but
are only used in one place.  Instead just do them where they are used for
readability.

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

fs/notify/fanotify/fanotify.c

+1 −2
Original line number Diff line number Diff line 
#include <linux/fanotify.h>

#include <linux/fdtable.h>

#include <linux/fsnotify_backend.h>

#include <linux/init.h>
@@ -5,8 +6,6 @@ 
#include <linux/mount.h>

#include <linux/types.h>



#include "fanotify.h"



static bool should_merge(struct fsnotify_event *old, struct fsnotify_event *new)

{

	pr_debug("%s: old=%p new=%p\n", __func__, old, new);

fs/notify/fanotify/fanotify.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
#include <linux/fanotify.h>

#include <linux/fsnotify_backend.h>

#include <linux/net.h>

#include <linux/kernel.h>

#include <linux/types.h>



extern const struct fsnotify_ops fanotify_fsnotify_ops;



static inline __u32 fanotify_outgoing_mask(__u32 mask)

{

	return mask & FAN_ALL_OUTGOING_EVENTS;

}

fs/notify/fanotify/fanotify_user.c

+3 −2
Original line number Diff line number Diff line 
#include <linux/fanotify.h>

#include <linux/fcntl.h>

#include <linux/file.h>

#include <linux/fs.h>
@@ -14,7 +15,7 @@ 


#include <asm/ioctls.h>



#include "fanotify.h"

extern const struct fsnotify_ops fanotify_fsnotify_ops;



static struct kmem_cache *fanotify_mark_cache __read_mostly;
@@ -102,7 +103,7 @@ 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->mask = event->mask & FAN_ALL_OUTGOING_EVENTS;

	metadata->pid = pid_vnr(event->tgid);

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