Commit eac8e9e8 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Eric Paris

fanotify: rename FAN_MARK_ON_VFSMOUNT to FAN_MARK_MOUNT

the term 'vfsmount' isn't sensicle to userspace.  instead call is 'mount.
Signed-off-by: default avatarAndreas Gruenbacher <agruen@suse.de>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent 0ff21db9
...@@ -516,7 +516,7 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags, ...@@ -516,7 +516,7 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags,
goto fput_and_out; goto fput_and_out;
/* inode held in place by reference to path; group by fget on fd */ /* inode held in place by reference to path; group by fget on fd */
if (!(flags & FAN_MARK_ON_VFSMOUNT)) if (!(flags & FAN_MARK_MOUNT))
inode = path.dentry->d_inode; inode = path.dentry->d_inode;
else else
mnt = path.mnt; mnt = path.mnt;
...@@ -525,7 +525,7 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags, ...@@ -525,7 +525,7 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags,
/* create/update an inode mark */ /* create/update an inode mark */
switch (flags & (FAN_MARK_ADD | FAN_MARK_REMOVE)) { switch (flags & (FAN_MARK_ADD | FAN_MARK_REMOVE)) {
case FAN_MARK_ADD: case FAN_MARK_ADD:
if (flags & FAN_MARK_ON_VFSMOUNT) if (flags & FAN_MARK_MOUNT)
ret = fanotify_add_vfsmount_mark(group, mnt, mask); ret = fanotify_add_vfsmount_mark(group, mnt, mask);
else else
ret = fanotify_add_inode_mark(group, inode, mask); ret = fanotify_add_inode_mark(group, inode, mask);
......
...@@ -29,13 +29,13 @@ ...@@ -29,13 +29,13 @@
#define FAN_MARK_REMOVE 0x00000002 #define FAN_MARK_REMOVE 0x00000002
#define FAN_MARK_DONT_FOLLOW 0x00000004 #define FAN_MARK_DONT_FOLLOW 0x00000004
#define FAN_MARK_ONLYDIR 0x00000008 #define FAN_MARK_ONLYDIR 0x00000008
#define FAN_MARK_ON_VFSMOUNT 0x00000010 #define FAN_MARK_MOUNT 0x00000010
#define FAN_ALL_MARK_FLAGS (FAN_MARK_ADD |\ #define FAN_ALL_MARK_FLAGS (FAN_MARK_ADD |\
FAN_MARK_REMOVE |\ FAN_MARK_REMOVE |\
FAN_MARK_DONT_FOLLOW |\ FAN_MARK_DONT_FOLLOW |\
FAN_MARK_ONLYDIR |\ FAN_MARK_ONLYDIR |\
FAN_MARK_ON_VFSMOUNT) FAN_MARK_MOUNT)
/* /*
* All of the events - we build the list by hand so that we can add flags in * All of the events - we build the list by hand so that we can add flags in
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment