Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / fs / autofs4 / dev-ioctl.c

diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
index 38a2f2c..ebedfb7 100644 (file)
--- a/fs/autofs4/dev-ioctl.c
+++ b/fs/autofs4/dev-ioctl.c
@@ -237,7 +237,7 @@ static void autofs_dev_ioctl_fd_install(unsigned int fd, struct file *file)
        fdt = files_fdtable(files);
        BUG_ON(fdt->fd[fd] != NULL);
        rcu_assign_pointer(fdt->fd[fd], file);
        fdt = files_fdtable(files);
        BUG_ON(fdt->fd[fd] != NULL);
        rcu_assign_pointer(fdt->fd[fd], file);

-       FD_SET(fd, fdt->close_on_exec);
+       __set_close_on_exec(fd, fdt);

        spin_unlock(&files->file_lock);
 }
 
        spin_unlock(&files->file_lock);
 }