projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'lsk-v4.4-17.03-android' of git://git.linaro.org/kernel/linux-linaro-stable.git
[firefly-linux-kernel-4.4.55.git]
/
ipc
/
mqueue.c
diff --git
a/ipc/mqueue.c
b/ipc/mqueue.c
index 161a1807e6efb0fe8e773c41dafc8b4a76b38f71..25b7a678f9efa0336b665b6af0fe236bc46043d1 100644
(file)
--- a/
ipc/mqueue.c
+++ b/
ipc/mqueue.c
@@
-747,7
+747,7
@@
static struct file *do_create(struct ipc_namespace *ipc_ns, struct inode *dir,
}
mode &= ~current_umask();
}
mode &= ~current_umask();
- ret = vfs_create
(
dir, path->dentry, mode, true);
+ ret = vfs_create
2(path->mnt,
dir, path->dentry, mode, true);
path->dentry->d_fsdata = NULL;
if (ret)
return ERR_PTR(ret);
path->dentry->d_fsdata = NULL;
if (ret)
return ERR_PTR(ret);
@@
-763,7
+763,7
@@
static struct file *do_open(struct path *path, int oflag)
if ((oflag & O_ACCMODE) == (O_RDWR | O_WRONLY))
return ERR_PTR(-EINVAL);
acc = oflag2acc[oflag & O_ACCMODE];
if ((oflag & O_ACCMODE) == (O_RDWR | O_WRONLY))
return ERR_PTR(-EINVAL);
acc = oflag2acc[oflag & O_ACCMODE];
- if (inode_permission
(
d_inode(path->dentry), acc))
+ if (inode_permission
2(path->mnt,
d_inode(path->dentry), acc))
return ERR_PTR(-EACCES);
return dentry_open(path, oflag, current_cred());
}
return ERR_PTR(-EACCES);
return dentry_open(path, oflag, current_cred());
}
@@
-796,7
+796,7
@@
SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, umode_t, mode,
ro = mnt_want_write(mnt); /* we'll drop it in any case */
error = 0;
mutex_lock(&d_inode(root)->i_mutex);
ro = mnt_want_write(mnt); /* we'll drop it in any case */
error = 0;
mutex_lock(&d_inode(root)->i_mutex);
- path.dentry = lookup_one_len
(name->name
, root, strlen(name->name));
+ path.dentry = lookup_one_len
2(name->name, mnt
, root, strlen(name->name));
if (IS_ERR(path.dentry)) {
error = PTR_ERR(path.dentry);
goto out_putfd;
if (IS_ERR(path.dentry)) {
error = PTR_ERR(path.dentry);
goto out_putfd;
@@
-867,7
+867,7
@@
SYSCALL_DEFINE1(mq_unlink, const char __user *, u_name)
if (err)
goto out_name;
mutex_lock_nested(&d_inode(mnt->mnt_root)->i_mutex, I_MUTEX_PARENT);
if (err)
goto out_name;
mutex_lock_nested(&d_inode(mnt->mnt_root)->i_mutex, I_MUTEX_PARENT);
- dentry = lookup_one_len
(name->name
, mnt->mnt_root,
+ dentry = lookup_one_len
2(name->name, mnt
, mnt->mnt_root,
strlen(name->name));
if (IS_ERR(dentry)) {
err = PTR_ERR(dentry);
strlen(name->name));
if (IS_ERR(dentry)) {
err = PTR_ERR(dentry);
@@
-879,7
+879,7
@@
SYSCALL_DEFINE1(mq_unlink, const char __user *, u_name)
err = -ENOENT;
} else {
ihold(inode);
err = -ENOENT;
} else {
ihold(inode);
- err = vfs_unlink
(
d_inode(dentry->d_parent), dentry, NULL);
+ err = vfs_unlink
2(mnt,
d_inode(dentry->d_parent), dentry, NULL);
}
dput(dentry);
}
dput(dentry);