Merge master.kernel.org:/home/rmk/linux-2.6-serial

[mv-sheeva.git] / fs / open.c

diff --git a/fs/open.c b/fs/open.c
index baffc084580da4adc584d6d54b42e493a454cb38..f53a5b9ffb7dce308f6e0e05d4982d343261564c 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -563,7 +563,7 @@ asmlinkage long sys_fchdir(unsigned int fd)
        if (!S_ISDIR(inode->i_mode))
                goto out_putf;
 
-       error = permission(inode, MAY_EXEC, NULL);
+       error = file_permission(file, MAY_EXEC);
        if (!error)
                set_fs_pwd(current->fs, mnt, dentry);
 out_putf: