Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6-omap-h63xx.git] / fs / inotify.c

diff --git a/fs/inotify.c b/fs/inotify.c
index 9fbaebfdf40bef99428d0feaa50d9b69cba234d0..bf7ce1d2412bb43928b908527287668eb59fb90d 100644 (file)
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -372,7 +372,7 @@ static int find_inode(const char __user *dirname, struct nameidata *nd)
        if (error)
                return error;
        /* you can only watch an inode if you have read permissions on it */
-       error = permission(nd->dentry->d_inode, MAY_READ, NULL);
+       error = vfs_permission(nd, MAY_READ);
        if (error) 
                path_release(nd);
        return error;