Merge tag 'edac/v3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[firefly-linux-kernel-4.4.55.git] / fs / seq_file.c

diff --git a/fs/seq_file.c b/fs/seq_file.c
index 3857b720cb1b258a3964ae4a3557094087eaa2ed..353948ba1c5b2d2ed08ead3448fb9218cbb89f96 100644 (file)
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -16,17 +16,6 @@
 #include <asm/uaccess.h>
 #include <asm/page.h>
 
-
-/*
- * seq_files have a buffer which can may overflow. When this happens a larger
- * buffer is reallocated and all the data will be printed again.
- * The overflow state is true when m->count == m->size.
- */
-static bool seq_overflow(struct seq_file *m)
-{
-       return m->count == m->size;
-}
-
 static void seq_set_overflow(struct seq_file *m)
 {
        m->count = m->size;
@@ -124,7 +113,7 @@ static int traverse(struct seq_file *m, loff_t offset)
                        error = 0;
                        m->count = 0;
                }
-               if (seq_overflow(m))
+               if (seq_has_overflowed(m))
                        goto Eoverflow;
                if (pos + m->count > offset) {
                        m->from = offset - pos;
@@ -267,7 +256,7 @@ Fill:
                        break;
                }
                err = m->op->show(m, p);
-               if (seq_overflow(m) || err) {
+               if (seq_has_overflowed(m) || err) {
                        m->count = offs;
                        if (likely(err <= 0))
                                break;