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: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Eric Paris <eparis@redhat.com>

diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 81267260d1b9c91c5abdc7b826e6da3ed3590f6f..091371e1bde34af41030770454ea6df5a57a240a 100644 (file)
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -516,7 +516,7 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags,
                goto fput_and_out;
 
        /* 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;
        else
                mnt = path.mnt;
@@ -525,7 +525,7 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags,
        /* create/update an inode mark */
        switch (flags & (FAN_MARK_ADD | FAN_MARK_REMOVE)) {
        case FAN_MARK_ADD:
-               if (flags & FAN_MARK_ON_VFSMOUNT)
+               if (flags & FAN_MARK_MOUNT)
                        ret = fanotify_add_vfsmount_mark(group, mnt, mask);
                else
                        ret = fanotify_add_inode_mark(group, inode, mask);

diff --git a/include/linux/fanotify.h b/include/linux/fanotify.h
index e25d348188ca69bf8d623ddbc4a533007a825e1d..5ee22fb274e561f2921996b871bc09554981bfc7 100644 (file)
--- a/include/linux/fanotify.h
+++ b/include/linux/fanotify.h
@@ -29,13 +29,13 @@
 #define FAN_MARK_REMOVE                0x00000002
 #define FAN_MARK_DONT_FOLLOW   0x00000004
 #define FAN_MARK_ONLYDIR       0x00000008
-#define FAN_MARK_ON_VFSMOUNT   0x00000010
+#define FAN_MARK_MOUNT         0x00000010
 
 #define FAN_ALL_MARK_FLAGS     (FAN_MARK_ADD |\
                                 FAN_MARK_REMOVE |\
                                 FAN_MARK_DONT_FOLLOW |\
                                 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