Merge branch 'work.autofs' into for-linus

[mirror_ubuntu-artful-kernel.git] / fs / namei.c

diff --git a/fs/namei.c b/fs/namei.c
index 81ac4736b596f4d15fa1df2871911e22f3ba6c19..47781b0d909d4e2f8d8a59e739d6244986ce2fae 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2894,7 +2894,7 @@ bool may_open_dev(const struct path *path)
                !(path->mnt->mnt_sb->s_iflags & SB_I_NODEV);
 }
 
-static int may_open(struct path *path, int acc_mode, int flag)
+static int may_open(const struct path *path, int acc_mode, int flag)
 {
        struct dentry *dentry = path->dentry;
        struct inode *inode = dentry->d_inode;
@@ -2944,7 +2944,7 @@ static int may_open(struct path *path, int acc_mode, int flag)
 
 static int handle_truncate(struct file *filp)
 {
-       struct path *path = &filp->f_path;
+       const struct path *path = &filp->f_path;
        struct inode *inode = path->dentry->d_inode;
        int error = get_write_access(inode);
        if (error)