sunrpc: record rpc client pointer in seq->private directly

pos in rpc_clnt_iter is useless, drop it and record clnt in seq_private.

Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/net/sunrpc/debugfs.c b/net/sunrpc/debugfs.c
index e7b4d93566df42dfa5ecf985152235e539ed9933..c8fd0b6c16189dfd21aaf2373b3fa72fa6c39860 100644 (file)
--- a/net/sunrpc/debugfs.c
+++ b/net/sunrpc/debugfs.c
@@ -16,11 +16,6 @@ static struct dentry *rpc_xprt_dir;
 
 unsigned int rpc_inject_disconnect;
 
-struct rpc_clnt_iter {
-       struct rpc_clnt *clnt;
-       loff_t          pos;
-};
-
 static int
 tasks_show(struct seq_file *f, void *v)
 {
@@ -47,12 +42,10 @@ static void *
 tasks_start(struct seq_file *f, loff_t *ppos)
        __acquires(&clnt->cl_lock)
 {
-       struct rpc_clnt_iter *iter = f->private;
+       struct rpc_clnt *clnt = f->private;
        loff_t pos = *ppos;
-       struct rpc_clnt *clnt = iter->clnt;
        struct rpc_task *task;
 
-       iter->pos = pos + 1;
        spin_lock(&clnt->cl_lock);
        list_for_each_entry(task, &clnt->cl_tasks, tk_task)
                if (pos-- == 0)
@@ -63,12 +56,10 @@ tasks_start(struct seq_file *f, loff_t *ppos)
 static void *
 tasks_next(struct seq_file *f, void *v, loff_t *pos)
 {
-       struct rpc_clnt_iter *iter = f->private;
-       struct rpc_clnt *clnt = iter->clnt;
+       struct rpc_clnt *clnt = f->private;
        struct rpc_task *task = v;
        struct list_head *next = task->tk_task.next;
 
-       ++iter->pos;
        ++*pos;
 
        /* If there's another task on list, return it */
@@ -81,9 +72,7 @@ static void
 tasks_stop(struct seq_file *f, void *v)
        __releases(&clnt->cl_lock)
 {
-       struct rpc_clnt_iter *iter = f->private;
-       struct rpc_clnt *clnt = iter->clnt;
-
+       struct rpc_clnt *clnt = f->private;
        spin_unlock(&clnt->cl_lock);
 }
 
@@ -96,17 +85,13 @@ static const struct seq_operations tasks_seq_operations = {
 
 static int tasks_open(struct inode *inode, struct file *filp)
 {
-       int ret = seq_open_private(filp, &tasks_seq_operations,
-                                       sizeof(struct rpc_clnt_iter));
-
+       int ret = seq_open(filp, &tasks_seq_operations);
        if (!ret) {
                struct seq_file *seq = filp->private_data;
-               struct rpc_clnt_iter *iter = seq->private;
-
-               iter->clnt = inode->i_private;
+               struct rpc_clnt *clnt = seq->private = inode->i_private;
 
-               if (!atomic_inc_not_zero(&iter->clnt->cl_count)) {
-                       seq_release_private(inode, filp);
+               if (!atomic_inc_not_zero(&clnt->cl_count)) {
+                       seq_release(inode, filp);
                        ret = -EINVAL;
                }
        }
@@ -118,10 +103,10 @@ static int
 tasks_release(struct inode *inode, struct file *filp)
 {
        struct seq_file *seq = filp->private_data;
-       struct rpc_clnt_iter *iter = seq->private;
+       struct rpc_clnt *clnt = seq->private;
 
-       rpc_release_client(iter->clnt);
-       return seq_release_private(inode, filp);
+       rpc_release_client(clnt);
+       return seq_release(inode, filp);
 }
 
 static const struct file_operations tasks_fops = {