Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[sfrench/cifs-2.6.git] / fs / notify / fanotify / fanotify_user.c

diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 72e367822efb4a5c56f064cdcaf1fbaf30dff19d..ec4d8c59d0e379df56efef0c86d3d303326ff071 100644 (file)
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -820,9 +820,8 @@ out_destroy_group:
        return fd;
 }
 
-SYSCALL_DEFINE5(fanotify_mark, int, fanotify_fd, unsigned int, flags,
-                             __u64, mask, int, dfd,
-                             const char  __user *, pathname)
+static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask,
+                           int dfd, const char  __user *pathname)
 {
        struct inode *inode = NULL;
        struct vfsmount *mnt = NULL;
@@ -928,13 +927,20 @@ fput_and_out:
        return ret;
 }
 
+SYSCALL_DEFINE5(fanotify_mark, int, fanotify_fd, unsigned int, flags,
+                             __u64, mask, int, dfd,
+                             const char  __user *, pathname)
+{
+       return do_fanotify_mark(fanotify_fd, flags, mask, dfd, pathname);
+}
+
 #ifdef CONFIG_COMPAT
 COMPAT_SYSCALL_DEFINE6(fanotify_mark,
                                int, fanotify_fd, unsigned int, flags,
                                __u32, mask0, __u32, mask1, int, dfd,
                                const char  __user *, pathname)
 {
-       return sys_fanotify_mark(fanotify_fd, flags,
+       return do_fanotify_mark(fanotify_fd, flags,
 #ifdef __BIG_ENDIAN
                                ((__u64)mask0 << 32) | mask1,
 #else