Merge branch 'work.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / fs / proc / proc_sysctl.c

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index dea0f5ee540cce0ba9d30ca67572c057d99a31ce..5d66faecd4ef06b8225a22e1abad55b3cf2ee3e1 100644 (file)
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -1807,7 +1807,7 @@ static int process_sysctl_arg(char *param, char *val,
                panic("%s: Failed to allocate path for %s\n", __func__, param);
        strreplace(path, '.', '/');
 
-       file = file_open_root((*proc_mnt)->mnt_root, *proc_mnt, path, O_WRONLY, 0);
+       file = file_open_root_mnt(*proc_mnt, path, O_WRONLY, 0);
        if (IS_ERR(file)) {
                err = PTR_ERR(file);
                if (err == -ENOENT)