1 files changed, 10 insertions, 3 deletions

diff --git a/fs/inotify.c b/fs/inotify.c
index bf7ce1d2412..2fecb7af4a7 100644
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -364,11 +364,12 @@ static int inotify_dev_get_wd(struct inotify_device *dev,
 /*
  * find_inode - resolve a user-given path to a specific inode and return a nd
  */
-static int find_inode(const char __user *dirname, struct nameidata *nd)
+static int find_inode(const char __user *dirname, struct nameidata *nd,
+                      unsigned flags)
 {
         int error;
 
-        error = __user_walk(dirname, LOOKUP_FOLLOW, nd);
+        error = __user_walk(dirname, flags, nd);
         if (error)
                 return error;
         /* you can only watch an inode if you have read permissions on it */
@@ -933,6 +934,7 @@ asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask)
         struct file *filp;
         int ret, fput_needed;
         int mask_add = 0;
+        unsigned flags = 0;
 
         filp = fget_light(fd, &fput_needed);
         if (unlikely(!filp))
@@ -944,7 +946,12 @@ asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask)
                 goto fput_and_out;
         }
 
-        ret = find_inode(path, &nd);
+        if (!(mask & IN_DONT_FOLLOW))
+                flags |= LOOKUP_FOLLOW;
+        if (mask & IN_ONLYDIR)
+                flags |= LOOKUP_DIRECTORY;
+
+        ret = find_inode(path, &nd, flags);
         if (unlikely(ret))
                 goto fput_and_out;