[PATCH] fs/namei.c: make path_lookup_create() static

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

diff --git a/fs/inotify.c b/fs/inotify.c
index a37e9fb1da589fa1457929e2079e176220ad34c0..bf7ce1d2412bb43928b908527287668eb59fb90d 100644 (file)
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -176,6 +176,7 @@ static inline void put_inotify_dev(struct inotify_device *dev)
        if (atomic_dec_and_test(&dev->count)) {
                atomic_dec(&dev->user->inotify_devs);
                free_uid(dev->user);
+               idr_destroy(&dev->idr);
                kfree(dev);
        }
 }
@@ -371,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;