[Devel] [PATCH RHEL7 COMMIT] Revert "ms/seq_file: fix problem when seeking mid-record"

Konstantin Khorenko khorenko at virtuozzo.com
Thu Apr 23 11:56:29 MSK 2020


The commit is pushed to "branch-rh7-3.10.0-1127.vz7.150.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1127.vz7.150.3
------>
commit d19ed49d8a584614a32a458552a7981a6f18095a
Author: Konstantin Khorenko <khorenko at virtuozzo.com>
Date:   Wed Apr 22 21:00:21 2020 +0300

    Revert "ms/seq_file: fix problem when seeking mid-record"
    
    This reverts commit 53d33823be0935ef9388d12782c2c8098812c1b5.
    
    RedHat has fixed the issue in another way,
    so no need in backporting mainstream patches, revert them.
    
    https://jira.sw.ru/browse/PSBM-99399
    
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
---
 fs/seq_file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/seq_file.c b/fs/seq_file.c
index 4dc70b8d6f3be..61fa5f8e8a58b 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -124,7 +124,6 @@ static int traverse(struct seq_file *m, loff_t offset)
 		}
 		if (seq_has_overflowed(m))
 			goto Eoverflow;
-		p = m->op->next(m, p, &m->index);
 		if (pos + m->count > offset) {
 			m->from = offset - pos;
 			m->count -= m->from;
@@ -132,6 +131,7 @@ static int traverse(struct seq_file *m, loff_t offset)
 		}
 		pos += m->count;
 		m->count = 0;
+		p = m->op->next(m, p, &m->index);
 		if (pos == offset)
 			break;
 	}


More information about the Devel mailing list