Merge remote-tracking branch 'regulator/topic/core' into regulator-next

[sfrench/cifs-2.6.git] / fs / open.c

diff --git a/fs/open.c b/fs/open.c
index 6d2d2b33ac54e80374a273e331e2954711186e5a..cd0c5be8d01247e8bab3f4e00e6f171803291881 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -460,20 +460,17 @@ out:
 SYSCALL_DEFINE1(fchdir, unsigned int, fd)
 {
        struct fd f = fdget_raw(fd);
-       struct inode *inode;
-       int error = -EBADF;
+       int error;
 
        error = -EBADF;
        if (!f.file)
                goto out;
 
-       inode = file_inode(f.file);
-
        error = -ENOTDIR;
-       if (!S_ISDIR(inode->i_mode))
+       if (!d_can_lookup(f.file->f_path.dentry))
                goto out_putf;
 
-       error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
+       error = inode_permission(file_inode(f.file), MAY_EXEC | MAY_CHDIR);
        if (!error)
                set_fs_pwd(current->fs, &f.file->f_path);
 out_putf: