Commit a713fd7f authored by Al Viro's avatar Al Viro

tidy do_mq_open() up a bit

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 9b20d7fc
...@@ -743,12 +743,11 @@ static int prepare_open(struct dentry *dentry, int oflag, int ro, ...@@ -743,12 +743,11 @@ static int prepare_open(struct dentry *dentry, int oflag, int ro,
static int do_mq_open(const char __user *u_name, int oflag, umode_t mode, static int do_mq_open(const char __user *u_name, int oflag, umode_t mode,
struct mq_attr *attr) struct mq_attr *attr)
{ {
struct path path; struct vfsmount *mnt = current->nsproxy->ipc_ns->mq_mnt;
struct dentry *root = mnt->mnt_root;
struct filename *name; struct filename *name;
struct path path;
int fd, error; int fd, error;
struct ipc_namespace *ipc_ns = current->nsproxy->ipc_ns;
struct vfsmount *mnt = ipc_ns->mq_mnt;
struct dentry *root = mnt->mnt_root;
int ro; int ro;
audit_mq_open(oflag, mode, attr); audit_mq_open(oflag, mode, attr);
...@@ -761,7 +760,6 @@ static int do_mq_open(const char __user *u_name, int oflag, umode_t mode, ...@@ -761,7 +760,6 @@ static int do_mq_open(const char __user *u_name, int oflag, umode_t mode,
goto out_putname; goto out_putname;
ro = mnt_want_write(mnt); /* we'll drop it in any case */ ro = mnt_want_write(mnt); /* we'll drop it in any case */
error = 0;
inode_lock(d_inode(root)); inode_lock(d_inode(root));
path.dentry = lookup_one_len(name->name, root, strlen(name->name)); path.dentry = lookup_one_len(name->name, root, strlen(name->name));
if (IS_ERR(path.dentry)) { if (IS_ERR(path.dentry)) {
...@@ -769,7 +767,6 @@ static int do_mq_open(const char __user *u_name, int oflag, umode_t mode, ...@@ -769,7 +767,6 @@ static int do_mq_open(const char __user *u_name, int oflag, umode_t mode,
goto out_putfd; goto out_putfd;
} }
path.mnt = mntget(mnt); path.mnt = mntget(mnt);
error = prepare_open(path.dentry, oflag, ro, mode, name, attr); error = prepare_open(path.dentry, oflag, ro, mode, name, attr);
if (!error) { if (!error) {
struct file *file = dentry_open(&path, oflag, current_cred()); struct file *file = dentry_open(&path, oflag, current_cred());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment