aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2009-12-17 21:24:29 -0500
committerEric Paris <eparis@redhat.com>2010-07-28 09:58:59 -0400
commiteac8e9e80ccbd30801b7b76a2ee4c6c5a681e53c (patch)
treec88fd90edfcf388d03d369c141683c4086b819dc
parent0ff21db9fcc39042b814dad8a4b7508710a75235 (diff)
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>
-rw-r--r--fs/notify/fanotify/fanotify_user.c4
-rw-r--r--include/linux/fanotify.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 81267260d1b9..091371e1bde3 100644
--- 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,
516 goto fput_and_out; 516 goto fput_and_out;
517 517
518 /* inode held in place by reference to path; group by fget on fd */ 518 /* inode held in place by reference to path; group by fget on fd */
519 if (!(flags & FAN_MARK_ON_VFSMOUNT)) 519 if (!(flags & FAN_MARK_MOUNT))
520 inode = path.dentry->d_inode; 520 inode = path.dentry->d_inode;
521 else 521 else
522 mnt = path.mnt; 522 mnt = path.mnt;
@@ -525,7 +525,7 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags,
525 /* create/update an inode mark */ 525 /* create/update an inode mark */
526 switch (flags & (FAN_MARK_ADD | FAN_MARK_REMOVE)) { 526 switch (flags & (FAN_MARK_ADD | FAN_MARK_REMOVE)) {
527 case FAN_MARK_ADD: 527 case FAN_MARK_ADD:
528 if (flags & FAN_MARK_ON_VFSMOUNT) 528 if (flags & FAN_MARK_MOUNT)
529 ret = fanotify_add_vfsmount_mark(group, mnt, mask); 529 ret = fanotify_add_vfsmount_mark(group, mnt, mask);
530 else 530 else
531 ret = fanotify_add_inode_mark(group, inode, mask); 531 ret = fanotify_add_inode_mark(group, inode, mask);
diff --git a/include/linux/fanotify.h b/include/linux/fanotify.h
index e25d348188ca..5ee22fb274e5 100644
--- a/include/linux/fanotify.h
+++ b/include/linux/fanotify.h
@@ -29,13 +29,13 @@
29#define FAN_MARK_REMOVE 0x00000002 29#define FAN_MARK_REMOVE 0x00000002
30#define FAN_MARK_DONT_FOLLOW 0x00000004 30#define FAN_MARK_DONT_FOLLOW 0x00000004
31#define FAN_MARK_ONLYDIR 0x00000008 31#define FAN_MARK_ONLYDIR 0x00000008
32#define FAN_MARK_ON_VFSMOUNT 0x00000010 32#define FAN_MARK_MOUNT 0x00000010
33 33
34#define FAN_ALL_MARK_FLAGS (FAN_MARK_ADD |\ 34#define FAN_ALL_MARK_FLAGS (FAN_MARK_ADD |\
35 FAN_MARK_REMOVE |\ 35 FAN_MARK_REMOVE |\
36 FAN_MARK_DONT_FOLLOW |\ 36 FAN_MARK_DONT_FOLLOW |\
37 FAN_MARK_ONLYDIR |\ 37 FAN_MARK_ONLYDIR |\
38 FAN_MARK_ON_VFSMOUNT) 38 FAN_MARK_MOUNT)
39 39
40/* 40/*
41 * All of the events - we build the list by hand so that we can add flags in 41 * All of the events - we build the list by hand so that we can add flags in