diff options
| author |   Andreas Gruenbacher <agruen@suse.de> | 2009-12-17 21:24:28 -0500 |
|---|---|---|
| committer |   Eric Paris <eparis@redhat.com> | 2010-07-28 09:58:58 -0400 |
| commit | 90dd201d1ab064512078a77762a793e0bf5f3040 (patch) | |
| tree | 23da2eabf9d2b5182ef831bf043189b5a1c1b371 /fs/notify/fanotify | |
| parent | fanotify: do not return pointer from fanotify_add_*_mark (diff) | |
| download | linux-dev-90dd201d1ab064512078a77762a793e0bf5f3040.tar.xz linux-dev-90dd201d1ab064512078a77762a793e0bf5f3040.zip | |
fanotify: remove fanotify_add_mark
fanotify_add_mark now does nothing useful anymore, drop it.
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'fs/notify/fanotify')
| -rw-r--r-- | fs/notify/fanotify/fanotify_user.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 7d7c13872852..db80a0d89d24 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -424,27 +424,6 @@ static int fanotify_add_inode_mark(struct fsnotify_group *group, return 0; } -static int fanotify_add_mark(struct fsnotify_group *group, struct inode *inode, - struct vfsmount *mnt, __u32 mask) -{ - int ret; - - pr_debug("%s: group=%p inode=%p mnt=%p mask=%x\n", - __func__, group, inode, mnt, mask); - - BUG_ON(inode && mnt); - BUG_ON(!inode && !mnt); - - if (inode) - ret = fanotify_add_inode_mark(group, inode, mask); - else if (mnt) - ret = fanotify_add_vfsmount_mark(group, mnt, mask); - else - BUG(); - - return ret; -} - static bool fanotify_mark_validate_input(int flags, __u32 mask) { @@ -542,7 +521,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: - ret = fanotify_add_mark(group, inode, NULL, mask); + ret = fanotify_add_inode_mark(group, inode, mask); break; case FAN_MARK_REMOVE: ret = fanotify_remove_mark(group, inode, NULL, mask); |