]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
md: Fix missing unused status line of /proc/mdstat
authorJan Glauber <jglauber@digitalocean.com>
Wed, 17 Mar 2021 14:04:39 +0000 (15:04 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 May 2021 08:49:26 +0000 (10:49 +0200)
commit 7abfabaf5f805f5171d133ce6af9b65ab766e76a upstream.

Reading /proc/mdstat with a read buffer size that would not
fit the unused status line in the first read will skip this
line from the output.

So 'dd if=/proc/mdstat bs=64 2>/dev/null' will not print something
like: unused devices: <none>

Don't return NULL immediately in start() for v=2 but call
show() once to print the status line also for multiple reads.

Cc: stable@vger.kernel.org
Fixes: 1f4aace60b0e ("fs/seq_file.c: simplify seq_file iteration code and interface")
Signed-off-by: Jan Glauber <jglauber@digitalocean.com>
Signed-off-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/md/md.c

index 5205d7ca055cd774c80b85f078f73b5e70415971..b15a96708a6d24dc78d0063558c817d67b6da66d 100644 (file)
@@ -8187,7 +8187,11 @@ static void *md_seq_start(struct seq_file *seq, loff_t *pos)
        loff_t l = *pos;
        struct mddev *mddev;
 
-       if (l >= 0x10000)
+       if (l == 0x10000) {
+               ++*pos;
+               return (void *)2;
+       }
+       if (l > 0x10000)
                return NULL;
        if (!l--)
                /* header */