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>

diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 7d7c13872852c84b52dd98a6a54d25fb2b687383..db80a0d89d24ba0f80d426f4df25a09a463297aa 100644 (file)
--- 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);