Simplify the code slightly by using the seq_open_data helper.

Signed-off-by: Rasmus Villemoes <li...@rasmusvillemoes.dk>
---
Depends on 1/8 introducing seq_open_data.

fs/proc/base.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/fs/proc/base.c b/fs/proc/base.c
index aaffc0c30216..32ed72c44412 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2747,7 +2747,6 @@ static int proc_id_map_open(struct inode *inode, struct 
file *file,
 {
        struct user_namespace *ns = NULL;
        struct task_struct *task;
-       struct seq_file *seq;
        int ret = -EINVAL;
 
        task = get_proc_task(inode);
@@ -2758,19 +2757,11 @@ static int proc_id_map_open(struct inode *inode, struct 
file *file,
                put_task_struct(task);
        }
        if (!ns)
-               goto err;
+               return ret;
 
-       ret = seq_open(file, seq_ops);
+       ret = seq_open_data(file, seq_ops, ns);
        if (ret)
-               goto err_put_ns;
-
-       seq = file->private_data;
-       seq->private = ns;
-
-       return 0;
-err_put_ns:
-       put_user_ns(ns);
-err:
+               put_user_ns(ns);
        return ret;
 }
 
-- 
2.16.4

Reply via email to