Skip to content

Commit

Permalink
fanotify: remove fanotify_add_mark
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andreas Gruenbacher authored and Eric Paris committed Jul 28, 2010
1 parent 52202df commit 90dd201
Showing 1 changed file with 1 addition and 22 deletions.
23 changes: 1 addition & 22 deletions fs/notify/fanotify/fanotify_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 90dd201

Please sign in to comment.