From c610c27a95019f303d21d2da9405b0de8da9218d Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 24 Aug 2008 07:45:33 -0400
Subject: [PATCH] --- yaml --- r: 109211 b: refs/heads/master c:
 4cdfe84b51420c9ac95c7133da2d4c8a191094af h: refs/heads/master i:   109209:
 5a834702f6e8bd38bb73968566261be34620da55   109207:
 2d4b3a73be9b7c737feee17be1cda7a6aae8228f v: v3

---
 [refs]              |  2 +-
 trunk/fs/seq_file.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a48cc71f7ac7..3aaa8cc6277b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59af1584bf33810639cb98d79856021253e2177c
+refs/heads/master: 4cdfe84b51420c9ac95c7133da2d4c8a191094af
diff --git a/trunk/fs/seq_file.c b/trunk/fs/seq_file.c
index 5d54205e486b..bd20f7f5a933 100644
--- a/trunk/fs/seq_file.c
+++ b/trunk/fs/seq_file.c
@@ -108,9 +108,9 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
 			goto Done;
 	}
 	/* we need at least one record in buffer */
+	pos = m->index;
+	p = m->op->start(m, &pos);
 	while (1) {
-		pos = m->index;
-		p = m->op->start(m, &pos);
 		err = PTR_ERR(p);
 		if (!p || IS_ERR(p))
 			break;
@@ -119,6 +119,11 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
 			break;
 		if (unlikely(err))
 			m->count = 0;
+		if (unlikely(!m->count)) {
+			p = m->op->next(m, p, &pos);
+			m->index = pos;
+			continue;
+		}
 		if (m->count < m->size)
 			goto Fill;
 		m->op->stop(m, p);
@@ -128,6 +133,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
 			goto Enomem;
 		m->count = 0;
 		m->version = 0;
+		pos = m->index;
+		p = m->op->start(m, &pos);
 	}
 	m->op->stop(m, p);
 	m->count = 0;